From d4a64796455acb20d239f287f5c7440ef44750b8 Mon Sep 17 00:00:00 2001
From: Oleh Kurpiak <oleh.kurpiak@gmail.com>
Date: Thu, 28 Nov 2019 17:19:03 +0200
Subject: [PATCH 1/2] [#4025] custom java annotations

---
 bin/java-petstore-feign-10x.sh                |  2 +-
 bin/java-petstore-feign.sh                    |  2 +-
 bin/spring-mvc-petstore-j8-async-server.sh    |  2 +-
 bin/spring-mvc-petstore-server.sh             |  2 +-
 bin/windows/java-petstore-feign-10x.bat       |  2 +-
 bin/windows/java-petstore-feign.bat           |  2 +-
 .../spring-mvc-petstore-j8-async-server.bat   |  2 +-
 bin/windows/spring-mvc-petstore-server.bat    |  2 +-
 docs/generators/groovy.md                     |  1 +
 docs/generators/java-inflector.md             |  1 +
 docs/generators/java-msf4j.md                 |  1 +
 docs/generators/java-pkmst.md                 |  1 +
 docs/generators/java-play-framework.md        |  1 +
 docs/generators/java-undertow-server.md       |  1 +
 docs/generators/java-vertx-web.md             |  1 +
 docs/generators/java-vertx.md                 |  1 +
 docs/generators/java.md                       |  1 +
 docs/generators/jaxrs-cxf-cdi.md              |  1 +
 docs/generators/jaxrs-cxf-client.md           |  1 +
 docs/generators/jaxrs-cxf-extended.md         |  1 +
 docs/generators/jaxrs-cxf.md                  |  1 +
 docs/generators/jaxrs-jersey.md               |  1 +
 docs/generators/jaxrs-resteasy-eap.md         |  1 +
 docs/generators/jaxrs-resteasy.md             |  1 +
 docs/generators/jaxrs-spec.md                 |  1 +
 docs/generators/spring.md                     |  1 +
 .../languages/AbstractJavaCodegen.java        | 27 ++++++++
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../src/main/resources/Java/pojo.mustache     |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/JavaInflector/pojo.mustache     |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/JavaJaxRS/cxf-cdi/pojo.mustache |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/JavaJaxRS/cxf-ext/pojo.mustache |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/JavaJaxRS/cxf/pojo.mustache     |  1 +
 .../main/resources/JavaJaxRS/pojo.mustache    |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../JavaJaxRS/resteasy/eap/pojo.mustache      |  2 +-
 .../JavaJaxRS/resteasy/pojo.mustache          |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/JavaJaxRS/spec/pojo.mustache    |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/JavaPlayFramework/pojo.mustache |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../main/resources/JavaSpring/pojo.mustache   |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/JavaVertXServer/pojo.mustache   |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../JavaVertXWebServer/pojo.mustache          |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../src/main/resources/apex/pojo.mustache     |  1 +
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../resources/java-msf4j-server/pojo.mustache |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../main/resources/java-pkmst/pojo.mustache   |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +
 .../java-undertow-server/pojo.mustache        |  2 +-
 .../main/default/classes/OASApiResponse.cls   |  1 +
 .../main/default/classes/OASCategory.cls      |  1 +
 .../main/default/classes/OASOrder.cls         |  1 +
 .../force-app/main/default/classes/OASPet.cls |  1 +
 .../force-app/main/default/classes/OASTag.cls |  1 +
 .../main/default/classes/OASUser.cls          |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  2 +
 .../model/AdditionalPropertiesArray.java      |  2 +
 .../model/AdditionalPropertiesBoolean.java    |  2 +
 .../model/AdditionalPropertiesClass.java      |  2 +
 .../model/AdditionalPropertiesInteger.java    |  2 +
 .../model/AdditionalPropertiesNumber.java     |  2 +
 .../model/AdditionalPropertiesObject.java     |  2 +
 .../model/AdditionalPropertiesString.java     |  2 +
 .../org/openapitools/client/model/Animal.java |  2 +
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +
 .../client/model/ArrayOfNumberOnly.java       |  2 +
 .../openapitools/client/model/ArrayTest.java  |  2 +
 .../client/model/Capitalization.java          |  2 +
 .../org/openapitools/client/model/Cat.java    |  2 +
 .../openapitools/client/model/CatAllOf.java   |  2 +
 .../openapitools/client/model/Category.java   |  2 +
 .../openapitools/client/model/ClassModel.java |  2 +
 .../org/openapitools/client/model/Client.java |  2 +
 .../org/openapitools/client/model/Dog.java    |  2 +
 .../openapitools/client/model/DogAllOf.java   |  2 +
 .../openapitools/client/model/EnumArrays.java |  2 +
 .../openapitools/client/model/EnumTest.java   |  2 +
 .../client/model/FileSchemaTestClass.java     |  2 +
 .../openapitools/client/model/FormatTest.java |  2 +
 .../client/model/HasOnlyReadOnly.java         |  2 +
 .../openapitools/client/model/MapTest.java    |  2 +
 ...ropertiesAndAdditionalPropertiesClass.java |  2 +
 .../client/model/Model200Response.java        |  2 +
 .../client/model/ModelApiResponse.java        |  2 +
 .../client/model/ModelReturn.java             |  2 +
 .../org/openapitools/client/model/Name.java   |  2 +
 .../openapitools/client/model/NumberOnly.java |  2 +
 .../org/openapitools/client/model/Order.java  |  2 +
 .../client/model/OuterComposite.java          |  2 +
 .../org/openapitools/client/model/Pet.java    |  2 +
 .../client/model/ReadOnlyFirst.java           |  2 +
 .../client/model/SpecialModelName.java        |  2 +
 .../org/openapitools/client/model/Tag.java    |  2 +
 .../client/model/TypeHolderDefault.java       |  2 +
 .../client/model/TypeHolderExample.java       |  2 +
 .../org/openapitools/client/model/User.java   |  2 +
 .../openapitools/client/model/XmlItem.java    |  2 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      |  1 +
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  1 +
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  1 +
 .../client/model/Capitalization.java          |  1 +
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  1 +
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  1 +
 .../openapitools/client/model/EnumTest.java   |  1 +
 .../client/model/FileSchemaTestClass.java     |  1 +
 .../openapitools/client/model/FormatTest.java |  1 +
 .../client/model/HasOnlyReadOnly.java         |  1 +
 .../openapitools/client/model/MapTest.java    |  1 +
 ...ropertiesAndAdditionalPropertiesClass.java |  1 +
 .../client/model/Model200Response.java        |  1 +
 .../client/model/ModelApiResponse.java        |  1 +
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  1 +
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  1 +
 .../client/model/OuterComposite.java          |  1 +
 .../org/openapitools/client/model/Pet.java    |  1 +
 .../client/model/ReadOnlyFirst.java           |  1 +
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  1 +
 .../client/model/TypeHolderDefault.java       |  1 +
 .../client/model/TypeHolderExample.java       |  1 +
 .../org/openapitools/client/model/User.java   |  1 +
 .../openapitools/client/model/XmlItem.java    |  1 +
 .../client/petstore/go/go-petstore/client.go  | 22 ++++++-
 .../petstore/go/go-petstore/configuration.go  |  2 +
 .../java/org/openapitools/model/Category.java |  1 +
 .../openapitools/model/ModelApiResponse.java  |  1 +
 .../java/org/openapitools/model/Order.java    |  1 +
 .../gen/java/org/openapitools/model/Pet.java  |  1 +
 .../gen/java/org/openapitools/model/Tag.java  |  1 +
 .../gen/java/org/openapitools/model/User.java |  1 +
 .../java/org/openapitools/model/Category.java |  1 +
 .../openapitools/model/ModelApiResponse.java  |  1 +
 .../java/org/openapitools/model/Order.java    |  1 +
 .../gen/java/org/openapitools/model/Pet.java  |  1 +
 .../gen/java/org/openapitools/model/Tag.java  |  1 +
 .../gen/java/org/openapitools/model/User.java |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      |  1 +
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../java/org/openapitools/model/Animal.java   |  1 +
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../openapitools/model/ArrayOfNumberOnly.java |  1 +
 .../org/openapitools/model/ArrayTest.java     |  1 +
 .../openapitools/model/Capitalization.java    |  1 +
 .../gen/java/org/openapitools/model/Cat.java  |  1 +
 .../java/org/openapitools/model/CatAllOf.java |  1 +
 .../java/org/openapitools/model/Category.java |  1 +
 .../org/openapitools/model/ClassModel.java    |  1 +
 .../java/org/openapitools/model/Client.java   |  1 +
 .../gen/java/org/openapitools/model/Dog.java  |  1 +
 .../java/org/openapitools/model/DogAllOf.java |  1 +
 .../org/openapitools/model/EnumArrays.java    |  1 +
 .../java/org/openapitools/model/EnumTest.java |  1 +
 .../model/FileSchemaTestClass.java            |  1 +
 .../org/openapitools/model/FormatTest.java    |  1 +
 .../openapitools/model/HasOnlyReadOnly.java   |  1 +
 .../java/org/openapitools/model/MapTest.java  |  1 +
 ...ropertiesAndAdditionalPropertiesClass.java |  1 +
 .../openapitools/model/Model200Response.java  |  1 +
 .../openapitools/model/ModelApiResponse.java  |  1 +
 .../org/openapitools/model/ModelReturn.java   |  1 +
 .../gen/java/org/openapitools/model/Name.java |  1 +
 .../org/openapitools/model/NumberOnly.java    |  1 +
 .../java/org/openapitools/model/Order.java    |  1 +
 .../openapitools/model/OuterComposite.java    |  1 +
 .../gen/java/org/openapitools/model/Pet.java  |  1 +
 .../org/openapitools/model/ReadOnlyFirst.java |  1 +
 .../openapitools/model/SpecialModelName.java  |  1 +
 .../gen/java/org/openapitools/model/Tag.java  |  1 +
 .../openapitools/model/TypeHolderDefault.java |  1 +
 .../openapitools/model/TypeHolderExample.java |  1 +
 .../gen/java/org/openapitools/model/User.java |  1 +
 .../java/org/openapitools/model/XmlItem.java  |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      |  1 +
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../java/org/openapitools/model/Animal.java   |  1 +
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../openapitools/model/ArrayOfNumberOnly.java |  1 +
 .../org/openapitools/model/ArrayTest.java     |  1 +
 .../openapitools/model/Capitalization.java    |  1 +
 .../main/java/org/openapitools/model/Cat.java |  1 +
 .../java/org/openapitools/model/CatAllOf.java |  1 +
 .../java/org/openapitools/model/Category.java |  1 +
 .../org/openapitools/model/ClassModel.java    |  1 +
 .../java/org/openapitools/model/Client.java   |  1 +
 .../main/java/org/openapitools/model/Dog.java |  1 +
 .../java/org/openapitools/model/DogAllOf.java |  1 +
 .../org/openapitools/model/EnumArrays.java    |  1 +
 .../java/org/openapitools/model/EnumTest.java |  1 +
 .../model/FileSchemaTestClass.java            |  1 +
 .../org/openapitools/model/FormatTest.java    |  1 +
 .../openapitools/model/HasOnlyReadOnly.java   |  1 +
 .../java/org/openapitools/model/MapTest.java  |  1 +
 ...ropertiesAndAdditionalPropertiesClass.java |  1 +
 .../openapitools/model/Model200Response.java  |  1 +
 .../openapitools/model/ModelApiResponse.java  |  1 +
 .../org/openapitools/model/ModelReturn.java   |  1 +
 .../java/org/openapitools/model/Name.java     |  1 +
 .../org/openapitools/model/NumberOnly.java    |  1 +
 .../java/org/openapitools/model/Order.java    |  1 +
 .../openapitools/model/OuterComposite.java    |  1 +
 .../main/java/org/openapitools/model/Pet.java |  1 +
 .../org/openapitools/model/ReadOnlyFirst.java |  1 +
 .../openapitools/model/SpecialModelName.java  |  1 +
 .../main/java/org/openapitools/model/Tag.java |  1 +
 .../openapitools/model/TypeHolderDefault.java |  1 +
 .../openapitools/model/TypeHolderExample.java |  1 +
 .../java/org/openapitools/model/User.java     |  1 +
 .../java/org/openapitools/model/XmlItem.java  |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      |  1 +
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../java/org/openapitools/model/Animal.java   |  1 +
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../openapitools/model/ArrayOfNumberOnly.java |  1 +
 .../org/openapitools/model/ArrayTest.java     |  1 +
 .../openapitools/model/Capitalization.java    |  1 +
 .../main/java/org/openapitools/model/Cat.java |  1 +
 .../java/org/openapitools/model/CatAllOf.java |  1 +
 .../java/org/openapitools/model/Category.java |  1 +
 .../org/openapitools/model/ClassModel.java    |  1 +
 .../java/org/openapitools/model/Client.java   |  1 +
 .../main/java/org/openapitools/model/Dog.java |  1 +
 .../java/org/openapitools/model/DogAllOf.java |  1 +
 .../org/openapitools/model/EnumArrays.java    |  1 +
 .../java/org/openapitools/model/EnumTest.java |  1 +
 .../model/FileSchemaTestClass.java            |  1 +
 .../org/openapitools/model/FormatTest.java    |  1 +
 .../openapitools/model/HasOnlyReadOnly.java   |  1 +
 .../java/org/openapitools/model/MapTest.java  |  1 +
 ...ropertiesAndAdditionalPropertiesClass.java |  1 +
 .../openapitools/model/Model200Response.java  |  1 +
 .../openapitools/model/ModelApiResponse.java  |  1 +
 .../org/openapitools/model/ModelReturn.java   |  1 +
 .../java/org/openapitools/model/Name.java     |  1 +
 .../org/openapitools/model/NumberOnly.java    |  1 +
 .../java/org/openapitools/model/Order.java    |  1 +
 .../openapitools/model/OuterComposite.java    |  1 +
 .../main/java/org/openapitools/model/Pet.java |  1 +
 .../org/openapitools/model/ReadOnlyFirst.java |  1 +
 .../openapitools/model/SpecialModelName.java  |  1 +
 .../main/java/org/openapitools/model/Tag.java |  1 +
 .../openapitools/model/TypeHolderDefault.java |  1 +
 .../openapitools/model/TypeHolderExample.java |  1 +
 .../java/org/openapitools/model/User.java     |  1 +
 .../java/org/openapitools/model/XmlItem.java  |  1 +
 update_all.sh                                 | 62 +++++++++++++++++++
 292 files changed, 476 insertions(+), 24 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache
 create mode 100644 update_all.sh

diff --git a/bin/java-petstore-feign-10x.sh b/bin/java-petstore-feign-10x.sh
index 15b1b40e2149..4e302a13fdd5 100755
--- a/bin/java-petstore-feign-10x.sh
+++ b/bin/java-petstore-feign-10x.sh
@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-10x.json -o samples/client/petstore/java/feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is $@"
+ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-10x.json -o samples/client/petstore/java/feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated $@"
 
 echo "Removing files and folders under samples/client/petstore/java/feign10x/src/main"
 rm -rf samples/client/petstore/java/feign10x/src/main
diff --git a/bin/java-petstore-feign.sh b/bin/java-petstore-feign.sh
index abac67deb9d2..eedc9a6669c7 100755
--- a/bin/java-petstore-feign.sh
+++ b/bin/java-petstore-feign.sh
@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-9x.json -o samples/client/petstore/java/feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is $@"
+ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-9x.json -o samples/client/petstore/java/feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated;@javax.annotation.concurrent.Immutable $@"
 
 echo "Removing files and folders under samples/client/petstore/java/feign/src/main"
 rm -rf samples/client/petstore/java/feign/src/main
diff --git a/bin/spring-mvc-petstore-j8-async-server.sh b/bin/spring-mvc-petstore-j8-async-server.sh
index fdbb35d4b415..23ec39e0b5e3 100755
--- a/bin/spring-mvc-petstore-j8-async-server.sh
+++ b/bin/spring-mvc-petstore-j8-async-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true,async=true --additional-properties serverPort=8002 $@"
+ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true,async=true --additional-properties serverPort=8002,additionalModelTypeAnnotations=@java.lang.Deprecated $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-mvc-petstore-server.sh b/bin/spring-mvc-petstore-server.sh
index ddbb1b4d64f4..5579ac9e8c1d 100755
--- a/bin/spring-mvc-petstore-server.sh
+++ b/bin/spring-mvc-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc --additional-properties hideGenerationTimestamp=true,java8=false --additional-properties serverPort=8002 --additional-properties booleanGetterPrefix=get $@"
+ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc --additional-properties hideGenerationTimestamp=true,java8=false --additional-properties serverPort=8002 --additional-properties booleanGetterPrefix=get,additionalModelTypeAnnotations=@java.lang.Deprecated $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/java-petstore-feign-10x.bat b/bin/windows/java-petstore-feign-10x.bat
index d9163fdac993..65948faabfe2 100644
--- a/bin/windows/java-petstore-feign-10x.bat
+++ b/bin/windows/java-petstore-feign-10x.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-10x.json -o samples\client\petstore\java\feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is
+set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-10x.json -o samples\client\petstore\java\feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore-feign.bat b/bin/windows/java-petstore-feign.bat
index e68e2d818f7b..f59a9e9e2e5b 100644
--- a/bin/windows/java-petstore-feign.bat
+++ b/bin/windows/java-petstore-feign.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-9x.json -o samples\client\petstore\java\feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is
+set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-9x.json -o samples\client\petstore\java\feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated;@javax.annotation.concurrent.Immutable
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/spring-mvc-petstore-j8-async-server.bat b/bin/windows/spring-mvc-petstore-j8-async-server.bat
index e87ba8ed7deb..f7929806a266 100644
--- a/bin/windows/spring-mvc-petstore-j8-async-server.bat
+++ b/bin/windows/spring-mvc-petstore-j8-async-server.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true,additionalModelTypeAnnotations=@java.lang.Deprecated
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/spring-mvc-petstore-server.bat b/bin/windows/spring-mvc-petstore-server.bat
index 02783f339cfa..59286d226098 100644
--- a/bin/windows/spring-mvc-petstore-server.bat
+++ b/bin/windows/spring-mvc-petstore-server.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -c bin\spring-mvc-petstore-server.json -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc --additional-properties hideGenerationTimestamp=true
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -c bin\spring-mvc-petstore-server.json -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc --additional-properties hideGenerationTimestamp=true,additionalModelTypeAnnotations=@java.lang.Deprecated
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md
index 7dcf10b07770..688b2b1ac93c 100644
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -34,6 +34,7 @@ sidebar_label: groovy
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index 4d3c774468ef..37856678e670 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -36,6 +36,7 @@ sidebar_label: java-inflector
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md
index 543aa97f828e..ece46f990464 100644
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -36,6 +36,7 @@ sidebar_label: java-msf4j
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md
index 6d33790e60c8..30eff4add446 100644
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -36,6 +36,7 @@ sidebar_label: java-pkmst
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md
index b7fa80b5823b..bad8968d3e29 100644
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -36,6 +36,7 @@ sidebar_label: java-play-framework
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md
index c620227b1ee5..6b780fa3f411 100644
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -36,6 +36,7 @@ sidebar_label: java-undertow-server
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md
index 059acc0a2a05..23aee105dd94 100644
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -36,6 +36,7 @@ sidebar_label: java-vertx-web
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md
index e285f021a16a..27240770c346 100644
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -36,6 +36,7 @@ sidebar_label: java-vertx
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 2ac7fbeaab57..108381ededac 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -36,6 +36,7 @@ sidebar_label: java
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index e90da21468bc..5a1cbe843b4a 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-cxf-cdi
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index 8b9ea2186ace..46f554eb3d86 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-cxf-client
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md
index df0d2004bd0a..9259685cc18a 100644
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-cxf-extended
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md
index bae14d53f147..bcb14352a976 100644
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-cxf
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 16419d4bf5f3..ee1782b73377 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-jersey
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md
index 615d5702600d..baa90886e533 100644
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-resteasy-eap
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md
index 885caa889622..62e6fc5254ea 100644
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-resteasy
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index e70657aa2fcc..1051b458ecdc 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -36,6 +36,7 @@ sidebar_label: jaxrs-spec
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/docs/generators/spring.md b/docs/generators/spring.md
index c122ddcb4deb..082d3fbd0d58 100644
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -36,6 +36,7 @@ sidebar_label: spring
 |java8|Option. Use Java8 classes instead of third party equivalents|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd><dl>|false|
 |disableHtmlEscaping|Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)| |false|
 |booleanGetterPrefix|Set booleanGetterPrefix| |get|
+|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations)| |null|
 |parentGroupId|parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentArtifactId|parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
 |parentVersion|parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect| |null|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index 4d99af1c0584..7bc938a68116 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -54,6 +54,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     public static final String SUPPORT_JAVA6 = "supportJava6";
     public static final String DISABLE_HTML_ESCAPING = "disableHtmlEscaping";
     public static final String BOOLEAN_GETTER_PREFIX = "booleanGetterPrefix";
+    public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS = "additionalModelTypeAnnotations";
 
     protected String dateLibrary = "threetenbp";
     protected boolean supportAsync = false;
@@ -91,6 +92,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     protected String parentArtifactId = "";
     protected String parentVersion = "";
     protected boolean parentOverridden = false;
+    protected List<String> additionalModelTypeAnnotations = new LinkedList<>();
 
     public AbstractJavaCodegen() {
         super();
@@ -184,6 +186,7 @@ public AbstractJavaCodegen() {
 
         cliOptions.add(CliOption.newBoolean(DISABLE_HTML_ESCAPING, "Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)", disableHtmlEscaping));
         cliOptions.add(CliOption.newString(BOOLEAN_GETTER_PREFIX, "Set booleanGetterPrefix").defaultValue(this.getBooleanGetterPrefix()));
+        cliOptions.add(CliOption.newString(ADDITIONAL_MODEL_TYPE_ANNOTATIONS, "Additional annotations for model type(class level annotations)"));
 
         cliOptions.add(CliOption.newString(CodegenConstants.PARENT_GROUP_ID, CodegenConstants.PARENT_GROUP_ID_DESC));
         cliOptions.add(CliOption.newString(CodegenConstants.PARENT_ARTIFACT_ID, CodegenConstants.PARENT_ARTIFACT_ID_DESC));
@@ -221,6 +224,12 @@ public void processOpts() {
         }
         additionalProperties.put(BOOLEAN_GETTER_PREFIX, booleanGetterPrefix);
 
+        if (additionalProperties.containsKey(ADDITIONAL_MODEL_TYPE_ANNOTATIONS)) {
+            String additionalAnnotationsList = additionalProperties.get(ADDITIONAL_MODEL_TYPE_ANNOTATIONS).toString();
+
+            this.setAdditionalModelTypeAnnotations(Arrays.asList(additionalAnnotationsList.split(";")));
+        }
+
         if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
             this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
         } else if (additionalProperties.containsKey(CodegenConstants.API_PACKAGE)) {
@@ -488,6 +497,20 @@ public void processOpts() {
         }
     }
 
+    @Override
+    public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
+        objs = super.updateAllModels(objs);
+
+        if (!additionalModelTypeAnnotations.isEmpty()) {
+            for (String modelName : objs.keySet()) {
+                Map<String, Object> models = (Map<String, Object>) objs.get(modelName);
+                models.put(ADDITIONAL_MODEL_TYPE_ANNOTATIONS, additionalModelTypeAnnotations);
+            }
+        }
+
+        return objs;
+    }
+
     private void sanitizeConfig() {
         // Sanitize any config options here. We also have to update the additionalProperties because
         // the whole additionalProperties object is injected into the main object passed to the mustache layer
@@ -1547,6 +1570,10 @@ public void setParentOverridden(final boolean parentOverridden) {
         this.parentOverridden = parentOverridden;
     }
 
+    public void setAdditionalModelTypeAnnotations(final List<String> additionalModelTypeAnnotations) {
+        this.additionalModelTypeAnnotations = additionalModelTypeAnnotations;
+    }
+
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
         super.addAdditionPropertiesToCodeGenModel(codegenModel, schema);
diff --git a/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index 9814954cc4b2..a6a955f674bb 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -9,7 +9,7 @@
 {{/vars}}
 })
 {{/jackson}}
-{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
+{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcelableModel}}implements Parcelable {{#serializableModel}}, Serializable {{/serializableModel}}{{/parcelableModel}}{{^parcelableModel}}{{#serializableModel}}implements Serializable {{/serializableModel}}{{/parcelableModel}}{
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache
index badfdbc35a3e..34c34a0ec26c 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache
@@ -1,5 +1,5 @@
 {{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
-{{>generatedAnnotation}}
+{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
index 8c5e307bdcd8..7dc2f63a74d7 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
@@ -3,7 +3,7 @@ import java.util.Objects;
 
 import javax.xml.bind.annotation.*;
 
-{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache
index 402331f1fbf6..bca023bfb808 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * {{{description}}}
  */
 @ApiModel(description="{{{description}}}")
-{{/description}}
+{{/description}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializableModel}} implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 {{>enumClass}}{{/isContainer}}{{#isContainer}}{{#mostInnerItems}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache
index df02462ff231..01277b09bd79 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache
@@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  **/
 @ApiModel(description="{{{description}}}")
 {{/description}}
+{{>additionalModelTypeAnnotations}}
 {{>xmlPojoAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializableModel}} implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 {{>enumClass}}{{/isContainer}}{{#isContainer}}{{#mostInnerItems}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
index 302b7e257c81..de0bfdefc95e 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
@@ -9,7 +9,7 @@
 {{/vars}}
 })
 {{/jackson}}
-{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
+{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
index a3262bd41d56..5a84cc5ae3fa 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
@@ -1,6 +1,6 @@
 import io.swagger.annotations.*;
 
-{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
+{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
index cbb6c907150c..d59951a58e5f 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
@@ -1,6 +1,6 @@
 import io.swagger.annotations.*;
 
-{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
+{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
index aecf440129d1..94744c6b6529 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 /**
  * {{description}}
  **/{{/description}}{{#useSwaggerAnnotations}}
-{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
index 164bbcea5d9d..7d1548eea495 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
@@ -5,7 +5,7 @@ import javax.validation.constraints.*;
 /**
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */
-{{>generatedAnnotation}}
+{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index 5ccc8a8c9368..9c748649e5f9 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -2,7 +2,7 @@
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
-{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
+{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{^parent}}{{#hateoas}}extends RepresentationModel<{{classname}}> {{/hateoas}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache
index 014ba3e2b435..f4ecbde54ac9 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache
@@ -1,4 +1,4 @@
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL){{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache
index 014ba3e2b435..f4ecbde54ac9 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache
@@ -1,4 +1,4 @@
-@JsonInclude(JsonInclude.Include.NON_NULL) 
+@JsonInclude(JsonInclude.Include.NON_NULL){{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/apex/pojo.mustache b/modules/openapi-generator/src/main/resources/apex/pojo.mustache
index 320b90922d84..3f6b3230bf88 100644
--- a/modules/openapi-generator/src/main/resources/apex/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/apex/pojo.mustache
@@ -1,6 +1,7 @@
 /**
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */
+{{>additionalModelTypeAnnotations}}
 public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{#interfaces}}{{#-first}} implements {{/-first}}{{^-first}}, {{/-first}}{{.}}{{/interfaces}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
index 38559db8fb43..75a026fd0a7d 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
@@ -2,7 +2,7 @@
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
-{{>generatedAnnotation}}
+{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
index 5b853d809439..ddf675092685 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
@@ -3,7 +3,7 @@
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
 {{#useBeanValidation}}@Validated{{/useBeanValidation}}
-{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
+{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache
new file mode 100644
index 000000000000..83379b1ea2f7
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache
@@ -0,0 +1,3 @@
+{{#additionalModelTypeAnnotations}}
+{{.}}
+{{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
index 5fb61ee6fc01..2bb86bee7997 100644
--- a/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
@@ -1,5 +1,5 @@
 {{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
-{{>generatedAnnotation}}
+{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls
index f9a93bbd3ca7..1ed36a5cea1a 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls
@@ -13,6 +13,7 @@
 /**
  * Describes the result of uploading an image resource
  */
+
 public class OASApiResponse implements OAS.MappedProperties {
     /**
      * Get code
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls
index 9b20682c9cdb..f7963e5c39cc 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls
@@ -13,6 +13,7 @@
 /**
  * A category for a pet
  */
+
 public class OASCategory {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls
index 641462b2e6c6..4af200bd2217 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls
@@ -13,6 +13,7 @@
 /**
  * An order for a pets from the pet store
  */
+
 public class OASOrder {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls
index b97944478972..23f0b6c7b4c4 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls
@@ -13,6 +13,7 @@
 /**
  * A pet for sale in the pet store
  */
+
 public class OASPet {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls
index b01069d4e187..53d2fabc7008 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls
@@ -13,6 +13,7 @@
 /**
  * A tag for a pet
  */
+
 public class OASTag {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls
index 7fd06c6d2cb4..43a13569f6f6 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls
@@ -13,6 +13,7 @@
 /**
  * A User who is purchasing from the pet store
  */
+
 public class OASUser {
     /**
      * Get id
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..f95b45229caf 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,6 +31,8 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..33267461ff89 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,6 +32,8 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..38f4f7bc1199 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,6 +31,8 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 781d4686e981..cef6ae54403d 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,6 +43,8 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..82e8181a0c00 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,6 +31,8 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..1f57b5814a43 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,6 +32,8 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..e8444f6460e1 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,6 +31,8 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..28d84194998c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,6 +31,8 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
index ff1d1f941aeb..dbfcf5acf9e4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
@@ -38,6 +38,8 @@
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Animal {
   public static final String JSON_PROPERTY_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 96f829bc648b..079c6edcc358 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,6 +32,8 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 37e40dbd3ec8..238afa3b1fe9 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,6 +32,8 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
index de7c895ac93a..bf7b908589fb 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,6 +34,8 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..82bc64d422ec 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,6 +34,8 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
index 569d7d08d590..4b959be99873 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
@@ -31,6 +31,8 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Cat extends Animal {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
index cc04e0e022d3..b336e1359710 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,6 +29,8 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..94833473ec5e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
@@ -30,6 +30,8 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..73b5b50235fc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,6 +30,8 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..3005a6484659 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
@@ -29,6 +29,8 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
index 78044654d500..51d1cf5a5295 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
@@ -31,6 +31,8 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Dog extends Animal {
   public static final String JSON_PROPERTY_BREED = "breed";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..ffda8cea34f5 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,6 +29,8 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
index aff182cd4983..f6512016b7a4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,6 +32,8 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class EnumArrays {
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..d119842bd835 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,6 +34,8 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class EnumTest {
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8166597792d0..915e4a953f9f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,6 +32,8 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
index 4dee7f6c9dcc..b7e759cdd691 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,6 +47,8 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..aa8402875755 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,6 +30,8 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
index 113f92dd9cbe..2cc3b95c9a81 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,6 +35,8 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d483d69700f8..288bc0230d51 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,6 +37,8 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..0a2bc1680643 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,6 +31,8 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..5aacba146cc8 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,6 +31,8 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..6e1bfb530ead 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,6 +30,8 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..6c22c7be7dc7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
@@ -33,6 +33,8 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..d89744210c2e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,6 +30,8 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index d4f5f1c55bd0..8d2b4d5d592e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -35,6 +35,8 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
index 4d73ff2bbd6f..dfac376419d6 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,6 +32,8 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
index be74dd5ca081..ddeffb96feb0 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
@@ -38,6 +38,8 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..4c704f42f62f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,6 +30,8 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..7bb379033bd3 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,6 +29,8 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..7d8988addb73 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,6 +30,8 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index e5996f694682..8711a9986c18 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,6 +36,8 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index b7f141913e71..1a4fdd1a8aa2 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,6 +37,8 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..eb6d74599160 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
@@ -36,6 +36,8 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
index 65e7c295192b..dcd3d33bb90e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,6 +60,8 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
+@java.lang.Deprecated
+@javax.annotation.concurrent.Immutable
 
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 0f1223c2bc61..b6a9842a69d9 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,6 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c03535ab9471..ee914f4f7d38 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,6 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 4356a4f8c1eb..da2ba5e86906 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,6 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 781d4686e981..7d76810f9b2c 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,6 +43,7 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 2426e7c974c4..d1929648c642 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,6 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index da407ccdc473..bed34d7b3c9f 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,6 +32,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5e468870311e..846082c4f56d 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,6 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ed080254966e..2217b03ff69a 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,6 +31,7 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
index ff1d1f941aeb..d5e42558b610 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
@@ -38,6 +38,7 @@
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
+@java.lang.Deprecated
 
 public class Animal {
   public static final String JSON_PROPERTY_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 96f829bc648b..5143bc81821f 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,6 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
+@java.lang.Deprecated
 
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 37e40dbd3ec8..a9d16bbb33ed 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,6 +32,7 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
+@java.lang.Deprecated
 
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
index de7c895ac93a..ede490150509 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,6 +34,7 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
+@java.lang.Deprecated
 
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
index 033e97881105..550cd22b28b4 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,6 +34,7 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
+@java.lang.Deprecated
 
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
index 569d7d08d590..88e2134d59a1 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
@@ -31,6 +31,7 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
+@java.lang.Deprecated
 
 public class Cat extends Animal {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
index cc04e0e022d3..792cf1e5ffb0 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,6 +29,7 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
+@java.lang.Deprecated
 
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
index 868ba8750742..860f8a8bfcf7 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
@@ -30,6 +30,7 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
index 4de7664b26a7..f66c25492fed 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,6 +30,7 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
+@java.lang.Deprecated
 
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
index 02b0aac2247a..45561a09adfd 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
@@ -29,6 +29,7 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
+@java.lang.Deprecated
 
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
index 78044654d500..42d49af745db 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
@@ -31,6 +31,7 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
+@java.lang.Deprecated
 
 public class Dog extends Animal {
   public static final String JSON_PROPERTY_BREED = "breed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
index dd42595cf202..76b217a78189 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,6 +29,7 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
+@java.lang.Deprecated
 
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
index aff182cd4983..eade56a72fd8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,6 +32,7 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
+@java.lang.Deprecated
 
 public class EnumArrays {
   /**
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
index 51a1a645a109..984cff54c84a 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,6 +34,7 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
+@java.lang.Deprecated
 
 public class EnumTest {
   /**
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8166597792d0..d37f06891160 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,6 +32,7 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
+@java.lang.Deprecated
 
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
index 4dee7f6c9dcc..e8eaac93f906 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,6 +47,7 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
+@java.lang.Deprecated
 
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 0a3f0d464360..c1a5aaca5f98 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,6 +30,7 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
+@java.lang.Deprecated
 
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
index 113f92dd9cbe..007d621e3046 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,6 +35,7 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
+@java.lang.Deprecated
 
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d483d69700f8..49b8d8e82fb7 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,6 +37,7 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
+@java.lang.Deprecated
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
index dd99468a0059..be4d8830347c 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,6 +31,7 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
+@java.lang.Deprecated
 
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 383cafdd3a5a..272e12c244c8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,6 +31,7 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
+@java.lang.Deprecated
 
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
index b62e13a90a0c..29942461de87 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,6 +30,7 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
+@java.lang.Deprecated
 
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
index bd625c5f66f3..111bad6b5b61 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
@@ -33,6 +33,7 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
+@java.lang.Deprecated
 
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5ca72a169fe8..366f62787ef6 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,6 +30,7 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
+@java.lang.Deprecated
 
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
index d4f5f1c55bd0..17a41e6ae5b7 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
@@ -35,6 +35,7 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
+@java.lang.Deprecated
 
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
index 4d73ff2bbd6f..50306359002b 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,6 +32,7 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
+@java.lang.Deprecated
 
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
index be74dd5ca081..ae2a084afdc8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
@@ -38,6 +38,7 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
+@java.lang.Deprecated
 
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b3e58ef3d2c5..181e4df33f3b 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,6 +30,7 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
+@java.lang.Deprecated
 
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 35ad3bf46994..75b446949147 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,6 +29,7 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
index a3ecb398faa3..81b95bb8c135 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,6 +30,7 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
+@java.lang.Deprecated
 
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index e5996f694682..6d084fc87d96 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,6 +36,7 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
+@java.lang.Deprecated
 
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index b7f141913e71..df37b48710bd 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,6 +37,7 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
+@java.lang.Deprecated
 
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
index b7e74643dab2..434d95451472 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
@@ -36,6 +36,7 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
+@java.lang.Deprecated
 
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
index 65e7c295192b..62b86d1a4a83 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,6 +60,7 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
+@java.lang.Deprecated
 
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go
index 83da6040263f..bdfa115bad96 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/client.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/client.go
@@ -17,8 +17,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"mime/multipart"
 	"net/http"
+	"net/http/httputil"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -175,7 +177,25 @@ func parameterToJson(obj interface{}) (string, error) {
 
 // callAPI do the request.
 func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) {
-	return c.cfg.HTTPClient.Do(request)
+	if c.cfg.Debug {
+	        dump, err := httputil.DumpRequestOut(request, true)
+		if err != nil {
+		        return nil, err
+		}
+		log.Printf("\n%s\n", string(dump))
+	}
+
+	resp, err := c.cfg.HTTPClient.Do(request)
+
+	if c.cfg.Debug {
+		dump, err := httputil.DumpResponse(resp, true)
+		if err != nil {
+			return resp, err
+		}
+		log.Printf("\n%s\n", string(dump))
+	}
+
+	return resp, err
 }
 
 // ChangeBasePath changes base path to allow switching to mocks
diff --git a/samples/openapi3/client/petstore/go/go-petstore/configuration.go b/samples/openapi3/client/petstore/go/go-petstore/configuration.go
index b3b81ad08246..40bb03ddcb57 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/configuration.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/configuration.go
@@ -56,6 +56,7 @@ type Configuration struct {
 	Scheme        string            `json:"scheme,omitempty"`
 	DefaultHeader map[string]string `json:"defaultHeader,omitempty"`
 	UserAgent     string            `json:"userAgent,omitempty"`
+	Debug         bool              `json:"debug,omitempty"`
 	HTTPClient    *http.Client
 }
 
@@ -65,6 +66,7 @@ func NewConfiguration() *Configuration {
 		BasePath:      "http://petstore.swagger.io:80/v2",
 		DefaultHeader: make(map[string]string),
 		UserAgent:     "OpenAPI-Generator/1.0.0/go",
+		Debug:         false,
 	}
 	return cfg
 }
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java
index 2a9c50e8ab82..1a3b018cf08d 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java
@@ -18,6 +18,7 @@
   * A category for a pet
  **/
 @ApiModel(description="A category for a pet")
+
 public class Category  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 8e0b124af4dc..454a2f2f0b4a 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -18,6 +18,7 @@
   * Describes the result of uploading an image resource
  **/
 @ApiModel(description="Describes the result of uploading an image resource")
+
 public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java
index cab33779ea61..7ec2480b9a47 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java
@@ -19,6 +19,7 @@
   * An order for a pets from the pet store
  **/
 @ApiModel(description="An order for a pets from the pet store")
+
 public class Order  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java
index 6cbeaf819529..1f56e1435878 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java
@@ -22,6 +22,7 @@
   * A pet for sale in the pet store
  **/
 @ApiModel(description="A pet for sale in the pet store")
+
 public class Pet  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java
index 10cbeef0e0a3..8d30130e25b7 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java
@@ -18,6 +18,7 @@
   * A tag for a pet
  **/
 @ApiModel(description="A tag for a pet")
+
 public class Tag  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java
index b1d7d8b02512..6e73c2080cd7 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java
@@ -18,6 +18,7 @@
   * A User who is purchasing from the pet store
  **/
 @ApiModel(description="A User who is purchasing from the pet store")
+
 public class User  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java
index 2a9c50e8ab82..1a3b018cf08d 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java
@@ -18,6 +18,7 @@
   * A category for a pet
  **/
 @ApiModel(description="A category for a pet")
+
 public class Category  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 8e0b124af4dc..454a2f2f0b4a 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -18,6 +18,7 @@
   * Describes the result of uploading an image resource
  **/
 @ApiModel(description="Describes the result of uploading an image resource")
+
 public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java
index cab33779ea61..7ec2480b9a47 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java
@@ -19,6 +19,7 @@
   * An order for a pets from the pet store
  **/
 @ApiModel(description="An order for a pets from the pet store")
+
 public class Order  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java
index 6cbeaf819529..1f56e1435878 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java
@@ -22,6 +22,7 @@
   * A pet for sale in the pet store
  **/
 @ApiModel(description="A pet for sale in the pet store")
+
 public class Pet  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java
index 10cbeef0e0a3..8d30130e25b7 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java
@@ -18,6 +18,7 @@
   * A tag for a pet
  **/
 @ApiModel(description="A tag for a pet")
+
 public class Tag  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java
index b1d7d8b02512..6e73c2080cd7 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java
@@ -18,6 +18,7 @@
   * A User who is purchasing from the pet store
  **/
 @ApiModel(description="A User who is purchasing from the pet store")
+
 public class User  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index f7b51130bdc5..815b0d747a81 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index d56c2d73f0bb..75b56431e060 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index c055eeff77cb..13ae9555aa38 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 964f668d2c34..6c0b08f6fad0 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -17,6 +17,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesClass  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 74f201910f5f..6bf461a1bc54 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index f99b0a19676a..933d668f84cb 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index fc4351c39f69..ef8deaf235c0 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index 2f762755b1d6..0520c61a46a3 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class AdditionalPropertiesString extends HashMap<String, String> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java
index cac03555be3d..f810fee9cb20 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 @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/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 8d71e8d68439..9821ec0e41aa 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class ArrayOfArrayOfNumberOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4f0dcee51e43..44575d6843ce 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class ArrayOfNumberOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java
index 38dc1305f797..d80b78e8d2c1 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class ArrayTest  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java
index 28121b91cb7e..ceb7ac8b7d2f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Capitalization  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java
index 547b056c8791..a954f1c24ba9 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Cat extends Animal {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java
index 30cb0e823afe..91492b23cde8 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class CatAllOf  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java
index a445fd2ab43b..f3d2afcf7b48 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Category  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java
index 7002f7449b6c..1d13e286e3a9 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java
@@ -18,6 +18,7 @@
   * Model for testing model with \"_class\" property
  **/
 @ApiModel(description="Model for testing model with \"_class\" property")
+
 public class ClassModel  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java
index 6741eddce5ce..a9f512a7e35f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Client  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java
index 48355040aa86..01b20dc63d88 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Dog extends Animal {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java
index 0a7fec88949b..a43c1a6f73e0 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class DogAllOf  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java
index 838558304e8d..fa51ad2a656f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class EnumArrays  {
   
 @XmlType(name="JustSymbolEnum")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java
index c50bae5b58fc..ee56f20a1fb9 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java
@@ -14,6 +14,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class EnumTest  {
   
 @XmlType(name="EnumStringEnum")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 50f7d73ed0d5..30733a926540 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -15,6 +15,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class FileSchemaTestClass  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
index f68bfe9b7338..41973ea254cd 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
@@ -18,6 +18,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class FormatTest  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index 4323df53511e..eb946cf4250f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class HasOnlyReadOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java
index c5a9c993fee2..47ca811359fd 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class MapTest  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9210f0d5db6f..97fdce3bf2e8 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -19,6 +19,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java
index acfc8f9dfe2e..64539f4429ae 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java
@@ -18,6 +18,7 @@
   * Model for testing model name starting with number
  **/
 @ApiModel(description="Model for testing model name starting with number")
+
 public class Model200Response  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 339319ddc2ba..bd2737c08def 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java
index 75dbf706c586..731a9423ee48 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -18,6 +18,7 @@
   * Model for testing reserved words
  **/
 @ApiModel(description="Model for testing reserved words")
+
 public class ModelReturn  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java
index 2f9750b4f38f..ff5aa3dce2a1 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java
@@ -18,6 +18,7 @@
   * Model for testing model name same as property name
  **/
 @ApiModel(description="Model for testing model name same as property name")
+
 public class Name  {
   
   @ApiModelProperty(required = true, value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java
index 3d61c8c76f22..5b1e142f0e0c 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -14,6 +14,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class NumberOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java
index 396dae890efd..84177b67734d 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java
@@ -14,6 +14,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Order  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java
index 02e622d85fbc..29bd3d9276ab 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -14,6 +14,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class OuterComposite  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java
index 3042dd056482..28097af56fe4 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java
@@ -17,6 +17,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Pet  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index fd9bd949729e..695e9eedfe17 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class ReadOnlyFirst  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java
index ef23af3fecc9..be157626af5c 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class SpecialModelName  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java
index 268e6f27211b..ca702d01bcfa 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class Tag  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index ace8f6a23bd2..7b6d97264a49 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class TypeHolderDefault  {
   
   @ApiModelProperty(required = true, value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 04715a41c388..73134c60c80e 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class TypeHolderExample  {
   
   @ApiModelProperty(example = "what", required = true, value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java
index af204eab8a80..f54c8682ae01 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java
@@ -13,6 +13,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class User  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java
index d12a3515382e..c9c7d0c9a90a 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java
@@ -16,6 +16,7 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+
 public class XmlItem  {
   
   @ApiModelProperty(example = "string", value = "")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..e0850d37251e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..9df672b67d30 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,6 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..4ac7040d05b7 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b7f58b90fa6b..ec45806cc76f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,6 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..4ae5a8206bba 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..8df9b8b988e4 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,6 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..086b6790396a 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..b9894ee6ea82 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
index 68d2e740966b..385e01b9d9df 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
@@ -20,6 +20,7 @@
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
+@java.lang.Deprecated
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d4aeef01b3e3..9942a0c3ff28 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,6 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
+@java.lang.Deprecated
 
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index b2da4b9b26a6..d9e6951d3c2a 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,6 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
+@java.lang.Deprecated
 
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
index fb134a8c4419..dc65c4e3c64c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,6 +15,7 @@
 /**
  * ArrayTest
  */
+@java.lang.Deprecated
 
 public class ArrayTest   {
   @JsonProperty("array_of_string")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..14ce46bd562c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,6 +12,7 @@
 /**
  * Capitalization
  */
+@java.lang.Deprecated
 
 public class Capitalization   {
   @JsonProperty("smallCamel")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..f8098869bc95 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
@@ -14,6 +14,7 @@
 /**
  * Cat
  */
+@java.lang.Deprecated
 
 public class Cat extends Animal  {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..1df4f5a43f27 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,6 +12,7 @@
 /**
  * CatAllOf
  */
+@java.lang.Deprecated
 
 public class CatAllOf   {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..3775a84a57d4 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
@@ -12,6 +12,7 @@
 /**
  * Category
  */
+@java.lang.Deprecated
 
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..3cad79a81688 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,6 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
+@java.lang.Deprecated
 
 public class ClassModel   {
   @JsonProperty("_class")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..6d542859d2a9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
@@ -12,6 +12,7 @@
 /**
  * Client
  */
+@java.lang.Deprecated
 
 public class Client   {
   @JsonProperty("client")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..f6d7eaff0cc7 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
@@ -14,6 +14,7 @@
 /**
  * Dog
  */
+@java.lang.Deprecated
 
 public class Dog extends Animal  {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..c1a705af3d2d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,6 +12,7 @@
 /**
  * DogAllOf
  */
+@java.lang.Deprecated
 
 public class DogAllOf   {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
index 3c0ea1ea75a5..61ba2a5acb53 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,6 +15,7 @@
 /**
  * EnumArrays
  */
+@java.lang.Deprecated
 
 public class EnumArrays   {
   /**
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
index 7c93e03bbb00..6646441cf43a 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,6 +14,7 @@
 /**
  * EnumTest
  */
+@java.lang.Deprecated
 
 public class EnumTest   {
   /**
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 2e88258ce75c..8fc1a4d3e150 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,6 +14,7 @@
 /**
  * FileSchemaTestClass
  */
+@java.lang.Deprecated
 
 public class FileSchemaTestClass   {
   @JsonProperty("file")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
index c2ca28b35414..b0628cee8164 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,6 +17,7 @@
 /**
  * FormatTest
  */
+@java.lang.Deprecated
 
 public class FormatTest   {
   @JsonProperty("integer")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..83e417a174c8 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,6 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
+@java.lang.Deprecated
 
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
index 19a6db9cb155..67fa02bea999 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
@@ -16,6 +16,7 @@
 /**
  * MapTest
  */
+@java.lang.Deprecated
 
 public class MapTest   {
   @JsonProperty("map_map_of_string")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6f7a0b5d56e3..bd91ab783ea0 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,6 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
+@java.lang.Deprecated
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..61ed52dd0903 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,6 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
+@java.lang.Deprecated
 
 public class Model200Response   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..52d5a22c1858 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,6 +12,7 @@
 /**
  * ModelApiResponse
  */
+@java.lang.Deprecated
 
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..f010d99aac08 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,6 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
+@java.lang.Deprecated
 
 public class ModelReturn   {
   @JsonProperty("return")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..9ef5bbe6c6ab 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
@@ -13,6 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
+@java.lang.Deprecated
 
 public class Name   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..23e666dd9bcc 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,6 +13,7 @@
 /**
  * NumberOnly
  */
+@java.lang.Deprecated
 
 public class NumberOnly   {
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
index c45d3e54504e..ebb886d7d8ac 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
@@ -14,6 +14,7 @@
 /**
  * Order
  */
+@java.lang.Deprecated
 
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..1d6c42cfeab2 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,6 +13,7 @@
 /**
  * OuterComposite
  */
+@java.lang.Deprecated
 
 public class OuterComposite   {
   @JsonProperty("my_number")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
index 5bea5f27a195..d4645ffd4750 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
@@ -17,6 +17,7 @@
 /**
  * Pet
  */
+@java.lang.Deprecated
 
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..666e6aa71591 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,6 +12,7 @@
 /**
  * ReadOnlyFirst
  */
+@java.lang.Deprecated
 
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..e8b8d72dc6d9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,6 +12,7 @@
 /**
  * SpecialModelName
  */
+@java.lang.Deprecated
 
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..aa0ff8f19eea 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
@@ -12,6 +12,7 @@
 /**
  * Tag
  */
+@java.lang.Deprecated
 
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7dd51d7ccd56..dd907d281509 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,6 +15,7 @@
 /**
  * TypeHolderDefault
  */
+@java.lang.Deprecated
 
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
index c1f4cbd00a72..41be6fea6a29 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,6 +15,7 @@
 /**
  * TypeHolderExample
  */
+@java.lang.Deprecated
 
 public class TypeHolderExample   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
index d195089778a9..6a9351d99d46 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
@@ -12,6 +12,7 @@
 /**
  * User
  */
+@java.lang.Deprecated
 
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
index dae97d794675..1ca37fc9e1ec 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,6 +15,7 @@
 /**
  * XmlItem
  */
+@java.lang.Deprecated
 
 public class XmlItem   {
   @JsonProperty("attribute_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 448c77cea931..e0850d37251e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesAnyType
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a80499fd79b9..9df672b67d30 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,6 +15,7 @@
 /**
  * AdditionalPropertiesArray
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index d8db9baf3105..4ac7040d05b7 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesBoolean
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index b9d1c52f961a..7557170fc8bd 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,6 +16,7 @@
 /**
  * AdditionalPropertiesClass
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index b94e539aa3f2..4ae5a8206bba 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesInteger
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c33e1e3b7a21..8df9b8b988e4 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,6 +15,7 @@
 /**
  * AdditionalPropertiesNumber
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index cab0c80d9b4c..086b6790396a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesObject
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 894eb466b4cc..b9894ee6ea82 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,6 +14,7 @@
 /**
  * AdditionalPropertiesString
  */
+@java.lang.Deprecated
 
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
index 68d2e740966b..385e01b9d9df 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
@@ -20,6 +20,7 @@
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
+@java.lang.Deprecated
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index a1fe8166abf8..43338885e403 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,6 +15,7 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
+@java.lang.Deprecated
 
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a76320466a38..d05ce1801466 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,6 +15,7 @@
 /**
  * ArrayOfNumberOnly
  */
+@java.lang.Deprecated
 
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
index df4610324400..fb41a4043bd1 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,6 +15,7 @@
 /**
  * ArrayTest
  */
+@java.lang.Deprecated
 
 public class ArrayTest   {
   @JsonProperty("array_of_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
index e1346fe63ea8..14ce46bd562c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,6 +12,7 @@
 /**
  * Capitalization
  */
+@java.lang.Deprecated
 
 public class Capitalization   {
   @JsonProperty("smallCamel")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
index f6d3c17d0be3..f8098869bc95 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
@@ -14,6 +14,7 @@
 /**
  * Cat
  */
+@java.lang.Deprecated
 
 public class Cat extends Animal  {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
index cf145ae53718..1df4f5a43f27 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,6 +12,7 @@
 /**
  * CatAllOf
  */
+@java.lang.Deprecated
 
 public class CatAllOf   {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
index db3f8e08dc0d..3775a84a57d4 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
@@ -12,6 +12,7 @@
 /**
  * Category
  */
+@java.lang.Deprecated
 
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
index ba96dc2add68..3cad79a81688 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,6 +13,7 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
+@java.lang.Deprecated
 
 public class ClassModel   {
   @JsonProperty("_class")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
index 59d479c85336..6d542859d2a9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
@@ -12,6 +12,7 @@
 /**
  * Client
  */
+@java.lang.Deprecated
 
 public class Client   {
   @JsonProperty("client")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
index 02e027c3feea..f6d7eaff0cc7 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
@@ -14,6 +14,7 @@
 /**
  * Dog
  */
+@java.lang.Deprecated
 
 public class Dog extends Animal  {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
index a1c4c17d8907..c1a705af3d2d 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,6 +12,7 @@
 /**
  * DogAllOf
  */
+@java.lang.Deprecated
 
 public class DogAllOf   {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
index 9592f35f25a1..53d41933ab78 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,6 +15,7 @@
 /**
  * EnumArrays
  */
+@java.lang.Deprecated
 
 public class EnumArrays   {
   /**
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
index 7c93e03bbb00..6646441cf43a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,6 +14,7 @@
 /**
  * EnumTest
  */
+@java.lang.Deprecated
 
 public class EnumTest   {
   /**
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index ab7b747bf2fa..1a837bfbcc35 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,6 +14,7 @@
 /**
  * FileSchemaTestClass
  */
+@java.lang.Deprecated
 
 public class FileSchemaTestClass   {
   @JsonProperty("file")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
index e0887e113301..6b6e6534715e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,6 +17,7 @@
 /**
  * FormatTest
  */
+@java.lang.Deprecated
 
 public class FormatTest   {
   @JsonProperty("integer")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c0e7dd75528e..83e417a174c8 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,6 +12,7 @@
 /**
  * HasOnlyReadOnly
  */
+@java.lang.Deprecated
 
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
index 7a4421206d0e..5e04511f6fb6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
@@ -16,6 +16,7 @@
 /**
  * MapTest
  */
+@java.lang.Deprecated
 
 public class MapTest   {
   @JsonProperty("map_map_of_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6c0fe72d4773..6fab2e00d49b 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,6 +18,7 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
+@java.lang.Deprecated
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
index 04606fb90460..61ed52dd0903 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,6 +13,7 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
+@java.lang.Deprecated
 
 public class Model200Response   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
index 1d385b21bd4d..52d5a22c1858 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,6 +12,7 @@
 /**
  * ModelApiResponse
  */
+@java.lang.Deprecated
 
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
index 82026635f5cb..f010d99aac08 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,6 +13,7 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
+@java.lang.Deprecated
 
 public class ModelReturn   {
   @JsonProperty("return")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
index 1180f019ea3f..9ef5bbe6c6ab 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
@@ -13,6 +13,7 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
+@java.lang.Deprecated
 
 public class Name   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
index 4423a2ac631d..23e666dd9bcc 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,6 +13,7 @@
 /**
  * NumberOnly
  */
+@java.lang.Deprecated
 
 public class NumberOnly   {
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
index 85e3c108d488..09e7888cf046 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
@@ -14,6 +14,7 @@
 /**
  * Order
  */
+@java.lang.Deprecated
 
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
index 61dbaaefeeae..1d6c42cfeab2 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,6 +13,7 @@
 /**
  * OuterComposite
  */
+@java.lang.Deprecated
 
 public class OuterComposite   {
   @JsonProperty("my_number")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
index 1fab3a2e1238..d8123892f25f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
@@ -17,6 +17,7 @@
 /**
  * Pet
  */
+@java.lang.Deprecated
 
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 4e1c3e681095..666e6aa71591 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,6 +12,7 @@
 /**
  * ReadOnlyFirst
  */
+@java.lang.Deprecated
 
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
index 6c0bfa749d3d..e8b8d72dc6d9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,6 +12,7 @@
 /**
  * SpecialModelName
  */
+@java.lang.Deprecated
 
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
index c72064ce0428..aa0ff8f19eea 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
@@ -12,6 +12,7 @@
 /**
  * Tag
  */
+@java.lang.Deprecated
 
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
index b88e00b47d78..10c868547f4b 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,6 +15,7 @@
 /**
  * TypeHolderDefault
  */
+@java.lang.Deprecated
 
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
index 85694fed2185..f5b4bbec5104 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,6 +15,7 @@
 /**
  * TypeHolderExample
  */
+@java.lang.Deprecated
 
 public class TypeHolderExample   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
index d195089778a9..6a9351d99d46 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
@@ -12,6 +12,7 @@
 /**
  * User
  */
+@java.lang.Deprecated
 
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
index ca74cfcfd91c..95e8e19e1eb6 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,6 +15,7 @@
 /**
  * XmlItem
  */
+@java.lang.Deprecated
 
 public class XmlItem   {
   @JsonProperty("attribute_string")
diff --git a/update_all.sh b/update_all.sh
new file mode 100644
index 000000000000..5cfc21d25d7d
--- /dev/null
+++ b/update_all.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+./bin/ruby-client-petstore.sh
+./bin/openapi3/ruby-client-petstore.sh
+./bin/openapi3/ruby-client-faraday-petstore.sh
+./bin/java-petstore-all.sh
+./bin/java-jaxrs-petstore-server-all.sh
+./bin/java-msf4j-petstore-server.sh
+./bin/openapi3/jaxrs-jersey-petstore.sh
+./bin/spring-all-petstore.sh
+./bin/javascript-petstore-all.sh
+./bin/kotlin-client-petstore-multiplatform.sh
+./bin/kotlin-client-petstore.sh
+./bin/kotlin-client-string.sh
+./bin/kotlin-client-threetenbp.sh
+./bin/kotlin-server-petstore.sh
+./bin/kotlin-springboot-petstore-server.sh
+./bin/kotlin-springboot-petstore-server-reactive.sh
+./bin/mysql-schema-petstore.sh
+./bin/nim-client-petstore.sh
+./bin/python-petstore-all.sh
+./bin/openapi3/python-petstore.sh
+./bin/php-petstore.sh
+./bin/php-silex-petstore-server.sh
+./bin/php-symfony-petstore.sh
+./bin/php-lumen-petstore-server.sh
+./bin/php-slim-server-petstore.sh
+./bin/php-ze-ph-petstore-server.sh
+./bin/openapi3/php-petstore.sh
+./bin/typescript-angularjs-petstore.sh
+./bin/typescript-angular-petstore-all.sh
+./bin/typescript-aurelia-petstore.sh
+./bin/typescript-axios-petstore-all.sh
+./bin/typescript-fetch-petstore-all.sh
+./bin/typescript-inversify-petstore.sh
+./bin/typescript-jquery-petstore-all.sh
+./bin/typescript-node-petstore-all.sh
+./bin/typescript-rxjs-petstore-all.sh
+./bin/rust-server-petstore.sh
+./bin/r-petstore.sh
+./bin/haskell-http-client-petstore.sh
+./bin/csharp-petstore.sh
+./bin/csharp-netcore-petstore-all.sh
+./bin/elixir-petstore.sh
+./bin/openapi3/go-petstore.sh
+./bin/go-experimental-petstore.sh
+./bin/go-petstore.sh
+./bin/go-petstore-withxml.sh
+./bin/go-gin-petstore-server.sh
+./bin/groovy-petstore.sh
+./bin/apex-petstore.sh
+./bin/perl-petstore-all.sh
+./bin/dart-jaguar-petstore.sh
+./bin/dart-petstore.sh
+./bin/dart2-petstore.sh
+./bin/java-play-framework-petstore-server-all.sh
+#./bin/elm-petstore-all.sh
+./bin/meta-codegen.sh
+# OTHERS
+./bin/utils/export_docs_generators.sh
+./bin/utils/copy-to-website.sh
+./bin/utils/export_generators_readme.sh
\ No newline at end of file

From c3150e5c6e786cd7c909b3d783e5828bb550ad54 Mon Sep 17 00:00:00 2001
From: Oleh Kurpiak <oleh.kurpiak@gmail.com>
Date: Tue, 3 Dec 2019 13:12:30 +0200
Subject: [PATCH 2/2] [#4025] fix samples

---
 bin/java-petstore-feign-10x.sh                |  2 +-
 bin/java-petstore-feign.sh                    |  2 +-
 bin/spring-mvc-petstore-j8-async-server.sh    |  2 +-
 bin/spring-mvc-petstore-server.sh             |  2 +-
 bin/windows/java-petstore-feign-10x.bat       |  2 +-
 bin/windows/java-petstore-feign.bat           |  2 +-
 .../spring-mvc-petstore-j8-async-server.bat   |  2 +-
 bin/windows/spring-mvc-petstore-server.bat    |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../src/main/resources/Java/pojo.mustache     |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../resources/JavaJaxRS/cxf-cdi/pojo.mustache |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../resources/JavaJaxRS/cxf/pojo.mustache     |  3 +-
 .../main/resources/JavaJaxRS/pojo.mustache    |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../JavaJaxRS/resteasy/eap/pojo.mustache      |  2 +-
 .../JavaJaxRS/resteasy/pojo.mustache          |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../resources/JavaJaxRS/spec/pojo.mustache    |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../resources/JavaPlayFramework/pojo.mustache |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../resources/JavaVertXServer/pojo.mustache   |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../JavaVertXWebServer/pojo.mustache          |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../src/main/resources/apex/pojo.mustache     |  3 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../resources/java-msf4j-server/pojo.mustache |  2 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../additionalModelTypeAnnotations.mustache   |  3 +-
 .../java-undertow-server/pojo.mustache        |  2 +-
 .../main/default/classes/OASApiResponse.cls   |  1 -
 .../main/default/classes/OASCategory.cls      |  1 -
 .../main/default/classes/OASOrder.cls         |  1 -
 .../force-app/main/default/classes/OASPet.cls |  1 -
 .../force-app/main/default/classes/OASTag.cls |  1 -
 .../main/default/classes/OASUser.cls          |  1 -
 .../model/AdditionalPropertiesAnyType.java    |  1 -
 .../model/AdditionalPropertiesArray.java      |  1 -
 .../model/AdditionalPropertiesBoolean.java    |  1 -
 .../model/AdditionalPropertiesClass.java      |  1 -
 .../model/AdditionalPropertiesInteger.java    |  1 -
 .../model/AdditionalPropertiesNumber.java     |  1 -
 .../model/AdditionalPropertiesObject.java     |  1 -
 .../model/AdditionalPropertiesString.java     |  1 -
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 -
 .../client/model/ArrayOfNumberOnly.java       |  1 -
 .../openapitools/client/model/ArrayTest.java  |  1 -
 .../client/model/Capitalization.java          |  1 -
 .../org/openapitools/client/model/Cat.java    |  1 -
 .../openapitools/client/model/CatAllOf.java   |  1 -
 .../openapitools/client/model/Category.java   |  1 -
 .../openapitools/client/model/ClassModel.java |  1 -
 .../org/openapitools/client/model/Client.java |  1 -
 .../org/openapitools/client/model/Dog.java    |  1 -
 .../openapitools/client/model/DogAllOf.java   |  1 -
 .../openapitools/client/model/EnumArrays.java |  1 -
 .../openapitools/client/model/EnumTest.java   |  1 -
 .../client/model/FileSchemaTestClass.java     |  1 -
 .../openapitools/client/model/FormatTest.java |  1 -
 .../client/model/HasOnlyReadOnly.java         |  1 -
 .../openapitools/client/model/MapTest.java    |  1 -
 ...ropertiesAndAdditionalPropertiesClass.java |  1 -
 .../client/model/Model200Response.java        |  1 -
 .../client/model/ModelApiResponse.java        |  1 -
 .../client/model/ModelReturn.java             |  1 -
 .../org/openapitools/client/model/Name.java   |  1 -
 .../openapitools/client/model/NumberOnly.java |  1 -
 .../org/openapitools/client/model/Order.java  |  1 -
 .../client/model/OuterComposite.java          |  1 -
 .../org/openapitools/client/model/Pet.java    |  1 -
 .../client/model/ReadOnlyFirst.java           |  1 -
 .../client/model/SpecialModelName.java        |  1 -
 .../org/openapitools/client/model/Tag.java    |  1 -
 .../client/model/TypeHolderDefault.java       |  1 -
 .../client/model/TypeHolderExample.java       |  1 -
 .../org/openapitools/client/model/User.java   |  1 -
 .../openapitools/client/model/XmlItem.java    |  1 -
 .../model/AdditionalPropertiesAnyType.java    |  1 -
 .../model/AdditionalPropertiesArray.java      |  1 -
 .../model/AdditionalPropertiesBoolean.java    |  1 -
 .../model/AdditionalPropertiesClass.java      |  1 -
 .../model/AdditionalPropertiesInteger.java    |  1 -
 .../model/AdditionalPropertiesNumber.java     |  1 -
 .../model/AdditionalPropertiesObject.java     |  1 -
 .../model/AdditionalPropertiesString.java     |  1 -
 .../org/openapitools/client/model/Animal.java |  1 -
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 -
 .../client/model/ArrayOfNumberOnly.java       |  1 -
 .../openapitools/client/model/ArrayTest.java  |  1 -
 .../client/model/Capitalization.java          |  1 -
 .../org/openapitools/client/model/Cat.java    |  1 -
 .../openapitools/client/model/CatAllOf.java   |  1 -
 .../openapitools/client/model/Category.java   |  1 -
 .../openapitools/client/model/ClassModel.java |  1 -
 .../org/openapitools/client/model/Client.java |  1 -
 .../org/openapitools/client/model/Dog.java    |  1 -
 .../openapitools/client/model/DogAllOf.java   |  1 -
 .../openapitools/client/model/EnumArrays.java |  1 -
 .../openapitools/client/model/EnumTest.java   |  1 -
 .../client/model/FileSchemaTestClass.java     |  1 -
 .../openapitools/client/model/FormatTest.java |  1 -
 .../client/model/HasOnlyReadOnly.java         |  1 -
 .../openapitools/client/model/MapTest.java    |  1 -
 ...ropertiesAndAdditionalPropertiesClass.java |  1 -
 .../client/model/Model200Response.java        |  1 -
 .../client/model/ModelApiResponse.java        |  1 -
 .../client/model/ModelReturn.java             |  1 -
 .../org/openapitools/client/model/Name.java   |  1 -
 .../openapitools/client/model/NumberOnly.java |  1 -
 .../org/openapitools/client/model/Order.java  |  1 -
 .../client/model/OuterComposite.java          |  1 -
 .../org/openapitools/client/model/Pet.java    |  1 -
 .../client/model/ReadOnlyFirst.java           |  1 -
 .../client/model/SpecialModelName.java        |  1 -
 .../org/openapitools/client/model/Tag.java    |  1 -
 .../client/model/TypeHolderDefault.java       |  1 -
 .../client/model/TypeHolderExample.java       |  1 -
 .../org/openapitools/client/model/User.java   |  1 -
 .../openapitools/client/model/XmlItem.java    |  1 -
 .../java/org/openapitools/model/Category.java |  1 -
 .../openapitools/model/ModelApiResponse.java  |  1 -
 .../java/org/openapitools/model/Order.java    |  1 -
 .../gen/java/org/openapitools/model/Pet.java  |  1 -
 .../gen/java/org/openapitools/model/Tag.java  |  1 -
 .../gen/java/org/openapitools/model/User.java |  1 -
 .../java/org/openapitools/model/Category.java |  1 -
 .../openapitools/model/ModelApiResponse.java  |  1 -
 .../java/org/openapitools/model/Order.java    |  1 -
 .../gen/java/org/openapitools/model/Pet.java  |  1 -
 .../gen/java/org/openapitools/model/Tag.java  |  1 -
 .../gen/java/org/openapitools/model/User.java |  1 -
 .../model/AdditionalPropertiesAnyType.java    |  1 -
 .../model/AdditionalPropertiesArray.java      |  1 -
 .../model/AdditionalPropertiesBoolean.java    |  1 -
 .../model/AdditionalPropertiesClass.java      |  1 -
 .../model/AdditionalPropertiesInteger.java    |  1 -
 .../model/AdditionalPropertiesNumber.java     |  1 -
 .../model/AdditionalPropertiesObject.java     |  1 -
 .../model/AdditionalPropertiesString.java     |  1 -
 .../java/org/openapitools/model/Animal.java   |  1 -
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 -
 .../openapitools/model/ArrayOfNumberOnly.java |  1 -
 .../org/openapitools/model/ArrayTest.java     |  1 -
 .../openapitools/model/Capitalization.java    |  1 -
 .../gen/java/org/openapitools/model/Cat.java  |  1 -
 .../java/org/openapitools/model/CatAllOf.java |  1 -
 .../java/org/openapitools/model/Category.java |  1 -
 .../org/openapitools/model/ClassModel.java    |  1 -
 .../java/org/openapitools/model/Client.java   |  1 -
 .../gen/java/org/openapitools/model/Dog.java  |  1 -
 .../java/org/openapitools/model/DogAllOf.java |  1 -
 .../org/openapitools/model/EnumArrays.java    |  1 -
 .../java/org/openapitools/model/EnumTest.java |  1 -
 .../model/FileSchemaTestClass.java            |  1 -
 .../org/openapitools/model/FormatTest.java    |  1 -
 .../openapitools/model/HasOnlyReadOnly.java   |  1 -
 .../java/org/openapitools/model/MapTest.java  |  1 -
 ...ropertiesAndAdditionalPropertiesClass.java |  1 -
 .../openapitools/model/Model200Response.java  |  1 -
 .../openapitools/model/ModelApiResponse.java  |  1 -
 .../org/openapitools/model/ModelReturn.java   |  1 -
 .../gen/java/org/openapitools/model/Name.java |  1 -
 .../org/openapitools/model/NumberOnly.java    |  1 -
 .../java/org/openapitools/model/Order.java    |  1 -
 .../openapitools/model/OuterComposite.java    |  1 -
 .../gen/java/org/openapitools/model/Pet.java  |  1 -
 .../org/openapitools/model/ReadOnlyFirst.java |  1 -
 .../openapitools/model/SpecialModelName.java  |  1 -
 .../gen/java/org/openapitools/model/Tag.java  |  1 -
 .../openapitools/model/TypeHolderDefault.java |  1 -
 .../openapitools/model/TypeHolderExample.java |  1 -
 .../gen/java/org/openapitools/model/User.java |  1 -
 .../java/org/openapitools/model/XmlItem.java  |  1 -
 .../model/AdditionalPropertiesAnyType.java    |  1 -
 .../model/AdditionalPropertiesArray.java      |  1 -
 .../model/AdditionalPropertiesBoolean.java    |  1 -
 .../model/AdditionalPropertiesClass.java      |  1 -
 .../model/AdditionalPropertiesInteger.java    |  1 -
 .../model/AdditionalPropertiesNumber.java     |  1 -
 .../model/AdditionalPropertiesObject.java     |  1 -
 .../model/AdditionalPropertiesString.java     |  1 -
 .../java/org/openapitools/model/Animal.java   |  1 -
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 -
 .../openapitools/model/ArrayOfNumberOnly.java |  1 -
 .../org/openapitools/model/ArrayTest.java     |  1 -
 .../openapitools/model/Capitalization.java    |  1 -
 .../main/java/org/openapitools/model/Cat.java |  1 -
 .../java/org/openapitools/model/CatAllOf.java |  1 -
 .../java/org/openapitools/model/Category.java |  1 -
 .../org/openapitools/model/ClassModel.java    |  1 -
 .../java/org/openapitools/model/Client.java   |  1 -
 .../main/java/org/openapitools/model/Dog.java |  1 -
 .../java/org/openapitools/model/DogAllOf.java |  1 -
 .../org/openapitools/model/EnumArrays.java    |  1 -
 .../java/org/openapitools/model/EnumTest.java |  1 -
 .../model/FileSchemaTestClass.java            |  1 -
 .../org/openapitools/model/FormatTest.java    |  1 -
 .../openapitools/model/HasOnlyReadOnly.java   |  1 -
 .../java/org/openapitools/model/MapTest.java  |  1 -
 ...ropertiesAndAdditionalPropertiesClass.java |  1 -
 .../openapitools/model/Model200Response.java  |  1 -
 .../openapitools/model/ModelApiResponse.java  |  1 -
 .../org/openapitools/model/ModelReturn.java   |  1 -
 .../java/org/openapitools/model/Name.java     |  1 -
 .../org/openapitools/model/NumberOnly.java    |  1 -
 .../java/org/openapitools/model/Order.java    |  1 -
 .../openapitools/model/OuterComposite.java    |  1 -
 .../main/java/org/openapitools/model/Pet.java |  1 -
 .../org/openapitools/model/ReadOnlyFirst.java |  1 -
 .../openapitools/model/SpecialModelName.java  |  1 -
 .../main/java/org/openapitools/model/Tag.java |  1 -
 .../openapitools/model/TypeHolderDefault.java |  1 -
 .../openapitools/model/TypeHolderExample.java |  1 -
 .../java/org/openapitools/model/User.java     |  1 -
 .../java/org/openapitools/model/XmlItem.java  |  1 -
 .../model/AdditionalPropertiesAnyType.java    |  1 -
 .../model/AdditionalPropertiesArray.java      |  1 -
 .../model/AdditionalPropertiesBoolean.java    |  1 -
 .../model/AdditionalPropertiesClass.java      |  1 -
 .../model/AdditionalPropertiesInteger.java    |  1 -
 .../model/AdditionalPropertiesNumber.java     |  1 -
 .../model/AdditionalPropertiesObject.java     |  1 -
 .../model/AdditionalPropertiesString.java     |  1 -
 .../java/org/openapitools/model/Animal.java   |  1 -
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 -
 .../openapitools/model/ArrayOfNumberOnly.java |  1 -
 .../org/openapitools/model/ArrayTest.java     |  1 -
 .../openapitools/model/Capitalization.java    |  1 -
 .../main/java/org/openapitools/model/Cat.java |  1 -
 .../java/org/openapitools/model/CatAllOf.java |  1 -
 .../java/org/openapitools/model/Category.java |  1 -
 .../org/openapitools/model/ClassModel.java    |  1 -
 .../java/org/openapitools/model/Client.java   |  1 -
 .../main/java/org/openapitools/model/Dog.java |  1 -
 .../java/org/openapitools/model/DogAllOf.java |  1 -
 .../org/openapitools/model/EnumArrays.java    |  1 -
 .../java/org/openapitools/model/EnumTest.java |  1 -
 .../model/FileSchemaTestClass.java            |  1 -
 .../org/openapitools/model/FormatTest.java    |  1 -
 .../openapitools/model/HasOnlyReadOnly.java   |  1 -
 .../java/org/openapitools/model/MapTest.java  |  1 -
 ...ropertiesAndAdditionalPropertiesClass.java |  1 -
 .../openapitools/model/Model200Response.java  |  1 -
 .../openapitools/model/ModelApiResponse.java  |  1 -
 .../org/openapitools/model/ModelReturn.java   |  1 -
 .../java/org/openapitools/model/Name.java     |  1 -
 .../org/openapitools/model/NumberOnly.java    |  1 -
 .../java/org/openapitools/model/Order.java    |  1 -
 .../openapitools/model/OuterComposite.java    |  1 -
 .../main/java/org/openapitools/model/Pet.java |  1 -
 .../org/openapitools/model/ReadOnlyFirst.java |  1 -
 .../openapitools/model/SpecialModelName.java  |  1 -
 .../main/java/org/openapitools/model/Tag.java |  1 -
 .../openapitools/model/TypeHolderDefault.java |  1 -
 .../openapitools/model/TypeHolderExample.java |  1 -
 .../java/org/openapitools/model/User.java     |  1 -
 .../java/org/openapitools/model/XmlItem.java  |  1 -
 update_all.sh                                 | 62 -------------------
 267 files changed, 39 insertions(+), 348 deletions(-)
 delete mode 100644 update_all.sh

diff --git a/bin/java-petstore-feign-10x.sh b/bin/java-petstore-feign-10x.sh
index 4e302a13fdd5..15b1b40e2149 100755
--- a/bin/java-petstore-feign-10x.sh
+++ b/bin/java-petstore-feign-10x.sh
@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-10x.json -o samples/client/petstore/java/feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated $@"
+ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-10x.json -o samples/client/petstore/java/feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is $@"
 
 echo "Removing files and folders under samples/client/petstore/java/feign10x/src/main"
 rm -rf samples/client/petstore/java/feign10x/src/main
diff --git a/bin/java-petstore-feign.sh b/bin/java-petstore-feign.sh
index eedc9a6669c7..48038613a82e 100755
--- a/bin/java-petstore-feign.sh
+++ b/bin/java-petstore-feign.sh
@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-9x.json -o samples/client/petstore/java/feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated;@javax.annotation.concurrent.Immutable $@"
+ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/feign -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-feign-9x.json -o samples/client/petstore/java/feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@javax.annotation.concurrent.Immutable $@"
 
 echo "Removing files and folders under samples/client/petstore/java/feign/src/main"
 rm -rf samples/client/petstore/java/feign/src/main
diff --git a/bin/spring-mvc-petstore-j8-async-server.sh b/bin/spring-mvc-petstore-j8-async-server.sh
index 23ec39e0b5e3..fdbb35d4b415 100755
--- a/bin/spring-mvc-petstore-j8-async-server.sh
+++ b/bin/spring-mvc-petstore-j8-async-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true,async=true --additional-properties serverPort=8002,additionalModelTypeAnnotations=@java.lang.Deprecated $@"
+ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -o samples/server/petstore/spring-mvc-j8-async -c bin/spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true,async=true --additional-properties serverPort=8002 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/spring-mvc-petstore-server.sh b/bin/spring-mvc-petstore-server.sh
index 5579ac9e8c1d..ddbb1b4d64f4 100755
--- a/bin/spring-mvc-petstore-server.sh
+++ b/bin/spring-mvc-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc --additional-properties hideGenerationTimestamp=true,java8=false --additional-properties serverPort=8002 --additional-properties booleanGetterPrefix=get,additionalModelTypeAnnotations=@java.lang.Deprecated $@"
+ags="generate -t modules/openapi-generator/src/main/resources/JavaSpring -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g spring -c bin/spring-mvc-petstore-server.json -o samples/server/petstore/spring-mvc --additional-properties hideGenerationTimestamp=true,java8=false --additional-properties serverPort=8002 --additional-properties booleanGetterPrefix=get $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/java-petstore-feign-10x.bat b/bin/windows/java-petstore-feign-10x.bat
index 65948faabfe2..d9163fdac993 100644
--- a/bin/windows/java-petstore-feign-10x.bat
+++ b/bin/windows/java-petstore-feign-10x.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-10x.json -o samples\client\petstore\java\feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated
+set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-10x.json -o samples\client\petstore\java\feign10x --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore-feign.bat b/bin/windows/java-petstore-feign.bat
index f59a9e9e2e5b..261965dcb6fc 100644
--- a/bin/windows/java-petstore-feign.bat
+++ b/bin/windows/java-petstore-feign.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-9x.json -o samples\client\petstore\java\feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@java.lang.Deprecated;@javax.annotation.concurrent.Immutable
+set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\feign -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-feign-9x.json -o samples\client\petstore\java\feign --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is,additionalModelTypeAnnotations=@javax.annotation.concurrent.Immutable
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/spring-mvc-petstore-j8-async-server.bat b/bin/windows/spring-mvc-petstore-j8-async-server.bat
index f7929806a266..e87ba8ed7deb 100644
--- a/bin/windows/spring-mvc-petstore-j8-async-server.bat
+++ b/bin/windows/spring-mvc-petstore-j8-async-server.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true,additionalModelTypeAnnotations=@java.lang.Deprecated
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json --additional-properties hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/spring-mvc-petstore-server.bat b/bin/windows/spring-mvc-petstore-server.bat
index 59286d226098..02783f339cfa 100644
--- a/bin/windows/spring-mvc-petstore-server.bat
+++ b/bin/windows/spring-mvc-petstore-server.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -c bin\spring-mvc-petstore-server.json -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc --additional-properties hideGenerationTimestamp=true,additionalModelTypeAnnotations=@java.lang.Deprecated
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -c bin\spring-mvc-petstore-server.json -g spring --library=spring-mvc -o samples\server\petstore\spring-mvc --additional-properties hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index a6a955f674bb..796f9a7ec141 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -9,7 +9,7 @@
 {{/vars}}
 })
 {{/jackson}}
-{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}{{>additionalModelTypeAnnotations}}
+{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcelableModel}}implements Parcelable {{#serializableModel}}, Serializable {{/serializableModel}}{{/parcelableModel}}{{^parcelableModel}}{{#serializableModel}}implements Serializable {{/serializableModel}}{{/parcelableModel}}{
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
index 7dc2f63a74d7..6d50290d16ed 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache
@@ -3,7 +3,7 @@ import java.util.Objects;
 
 import javax.xml.bind.annotation.*;
 
-{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
+{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache
index 01277b09bd79..df99f136dc2b 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pojo.mustache
@@ -14,8 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  **/
 @ApiModel(description="{{{description}}}")
 {{/description}}
-{{>additionalModelTypeAnnotations}}
-{{>xmlPojoAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializableModel}} implements Serializable{{/serializableModel}} {
+{{>additionalModelTypeAnnotations}}{{>xmlPojoAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}}{{#serializableModel}} implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 {{>enumClass}}{{/isContainer}}{{#isContainer}}{{#mostInnerItems}}
 {{>enumClass}}{{/mostInnerItems}}{{/isContainer}}{{/isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
index de0bfdefc95e..7dc314102f4c 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache
@@ -9,7 +9,7 @@
 {{/vars}}
 })
 {{/jackson}}
-{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
+{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
index 5a84cc5ae3fa..9b66957fbf1a 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache
@@ -1,6 +1,6 @@
 import io.swagger.annotations.*;
 
-{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
+{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
index d59951a58e5f..3e3815c4aeb6 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache
@@ -1,6 +1,6 @@
 import io.swagger.annotations.*;
 
-{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>additionalModelTypeAnnotations}}
+{{#description}}@ApiModel(description="{{{description}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
index 94744c6b6529..dc9bd039d023 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pojo.mustache
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 /**
  * {{description}}
  **/{{/description}}{{#useSwaggerAnnotations}}
-{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}{{>additionalModelTypeAnnotations}}
+{{#description}}{{>additionalModelTypeAnnotations}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
index 7d1548eea495..f047ee983367 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/pojo.mustache
@@ -5,7 +5,7 @@ import javax.validation.constraints.*;
 /**
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */
-{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}
+{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"})
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache
index f4ecbde54ac9..8a1d4180d448 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache
@@ -1,4 +1,4 @@
-@JsonInclude(JsonInclude.Include.NON_NULL){{>additionalModelTypeAnnotations}}
+{{>additionalModelTypeAnnotations}}@JsonInclude(JsonInclude.Include.NON_NULL)
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache
index f4ecbde54ac9..8a1d4180d448 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache
@@ -1,4 +1,4 @@
-@JsonInclude(JsonInclude.Include.NON_NULL){{>additionalModelTypeAnnotations}}
+{{>additionalModelTypeAnnotations}}@JsonInclude(JsonInclude.Include.NON_NULL)
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/apex/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/apex/pojo.mustache b/modules/openapi-generator/src/main/resources/apex/pojo.mustache
index 3f6b3230bf88..9f192178eeac 100644
--- a/modules/openapi-generator/src/main/resources/apex/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/apex/pojo.mustache
@@ -1,7 +1,6 @@
 /**
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
- */
-{{>additionalModelTypeAnnotations}}
+ */{{>additionalModelTypeAnnotations}}
 public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{#interfaces}}{{#-first}} implements {{/-first}}{{^-first}}, {{/-first}}{{.}}{{/interfaces}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
index 75a026fd0a7d..7f44c8fd1255 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/pojo.mustache
@@ -2,7 +2,7 @@
  * {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
-{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}
+{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}
     {{#isEnum}}
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache
index 83379b1ea2f7..e5dc1ac12950 100644
--- a/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache
+++ b/modules/openapi-generator/src/main/resources/java-undertow-server/additionalModelTypeAnnotations.mustache
@@ -1,3 +1,2 @@
-{{#additionalModelTypeAnnotations}}
-{{.}}
+{{#additionalModelTypeAnnotations}}{{.}}
 {{/additionalModelTypeAnnotations}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
index 2bb86bee7997..6590268dc969 100644
--- a/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-undertow-server/pojo.mustache
@@ -1,5 +1,5 @@
 {{#description}}@ApiModel(description = "{{{description}}}"){{/description}}
-{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}
+{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls
index 1ed36a5cea1a..f9a93bbd3ca7 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASApiResponse.cls
@@ -13,7 +13,6 @@
 /**
  * Describes the result of uploading an image resource
  */
-
 public class OASApiResponse implements OAS.MappedProperties {
     /**
      * Get code
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls
index f7963e5c39cc..9b20682c9cdb 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASCategory.cls
@@ -13,7 +13,6 @@
 /**
  * A category for a pet
  */
-
 public class OASCategory {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls
index 4af200bd2217..641462b2e6c6 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASOrder.cls
@@ -13,7 +13,6 @@
 /**
  * An order for a pets from the pet store
  */
-
 public class OASOrder {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls
index 23f0b6c7b4c4..b97944478972 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASPet.cls
@@ -13,7 +13,6 @@
 /**
  * A pet for sale in the pet store
  */
-
 public class OASPet {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls
index 53d2fabc7008..b01069d4e187 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASTag.cls
@@ -13,7 +13,6 @@
 /**
  * A tag for a pet
  */
-
 public class OASTag {
     /**
      * Get id
diff --git a/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls b/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls
index 43a13569f6f6..7fd06c6d2cb4 100644
--- a/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls
+++ b/samples/client/petstore/apex/force-app/main/default/classes/OASUser.cls
@@ -13,7 +13,6 @@
 /**
  * A User who is purchasing from the pet store
  */
-
 public class OASUser {
     /**
      * Get id
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index f95b45229caf..b3b18538873c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 33267461ff89..b096a099e9d3 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesArray extends HashMap<String, List> {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 38f4f7bc1199..cb08b798a87b 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index cef6ae54403d..e35f2cca9ab1 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,6 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesClass {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 82e8181a0c00..c3241fbab3d0 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 1f57b5814a43..2e4c40ce549a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index e8444f6460e1..ac8cd6cf1529 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 28d84194998c..94b3707ee950 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class AdditionalPropertiesString extends HashMap<String, String> {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
index dbfcf5acf9e4..845a10ecb10d 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
@@ -32,14 +32,13 @@
   Animal.JSON_PROPERTY_CLASS_NAME,
   Animal.JSON_PROPERTY_COLOR
 })
+@javax.annotation.concurrent.Immutable
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
-@java.lang.Deprecated
-@javax.annotation.concurrent.Immutable
 
 public class Animal {
   public static final String JSON_PROPERTY_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 079c6edcc358..d2b96d3910ac 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class ArrayOfArrayOfNumberOnly {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 238afa3b1fe9..c4ad3fd608d4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class ArrayOfNumberOnly {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
index bf7b908589fb..c650f156e577 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,6 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class ArrayTest {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
index 82bc64d422ec..20050a23c00b 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,6 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Capitalization {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
index 4b959be99873..80b4560effc7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Cat extends Animal {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
index b336e1359710..a1c88ddb1204 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class CatAllOf {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
index 94833473ec5e..e351a7841bb2 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,6 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Category {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
index 73b5b50235fc..01403deddd8c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,6 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class ClassModel {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
index 3005a6484659..6cd245b2f72b 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Client {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
index 51d1cf5a5295..fd9ac0975c6c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Dog extends Animal {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
index ffda8cea34f5..579423163570 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class DogAllOf {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
index f6512016b7a4..5585af2f9c2e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,6 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class EnumArrays {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
index d119842bd835..ca72f8b90120 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,6 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class EnumTest {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 915e4a953f9f..d1793a655e00 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,6 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class FileSchemaTestClass {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
index b7e759cdd691..20939e85f8ba 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,6 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class FormatTest {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index aa8402875755..43e9ddd65f65 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,6 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class HasOnlyReadOnly {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
index 2cc3b95c9a81..62492374cca1 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,6 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class MapTest {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 288bc0230d51..205ba6040a90 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,6 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
index 0a2bc1680643..5d4a6f984618 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,6 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Model200Response {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 5aacba146cc8..d6acae129e41 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,6 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class ModelApiResponse {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
index 6e1bfb530ead..9b51c8944a48 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,6 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class ModelReturn {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
index 6c22c7be7dc7..811858d4a843 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,6 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Name {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
index d89744210c2e..7e27fe83b1cc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,6 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class NumberOnly {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index 8d2b4d5d592e..aa3d4a98d0cc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,6 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Order {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
index dfac376419d6..89b5ed48f3b5 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,6 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class OuterComposite {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
index ddeffb96feb0..874476d41a34 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
@@ -38,7 +38,6 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Pet {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4c704f42f62f..1cee03d06c3a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,6 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class ReadOnlyFirst {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 7bb379033bd3..453c8ad9b99b 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class SpecialModelName {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
index 7d8988addb73..a7c2f4cafe26 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,6 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class Tag {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8711a9986c18..f5a3d19c0a9f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,6 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class TypeHolderDefault {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 1a4fdd1a8aa2..d00f5441862a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,6 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class TypeHolderExample {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
index eb6d74599160..f83fb1e67185 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,6 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class User {
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
index dcd3d33bb90e..22d7ad370541 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,6 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-@java.lang.Deprecated
 @javax.annotation.concurrent.Immutable
 
 public class XmlItem {
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index b6a9842a69d9..0f1223c2bc61 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index ee914f4f7d38..c03535ab9471 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesArray.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index da2ba5e86906..4356a4f8c1eb 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 7d76810f9b2c..781d4686e981 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -43,7 +43,6 @@
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
   AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_STRING = "map_string";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index d1929648c642..2426e7c974c4 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesInteger.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index bed34d7b3c9f..da407ccdc473 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesNumber.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 846082c4f56d..5e468870311e 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesObject.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 2217b03ff69a..ed080254966e 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   AdditionalPropertiesString.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class AdditionalPropertiesString extends HashMap<String, String> {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
index d5e42558b610..ff1d1f941aeb 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
@@ -38,7 +38,6 @@
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
-@java.lang.Deprecated
 
 public class Animal {
   public static final String JSON_PROPERTY_CLASS_NAME = "className";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 5143bc81821f..96f829bc648b 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
 })
-@java.lang.Deprecated
 
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index a9d16bbb33ed..37e40dbd3ec8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -32,7 +32,6 @@
 @JsonPropertyOrder({
   ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
 })
-@java.lang.Deprecated
 
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
index ede490150509..de7c895ac93a 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -34,7 +34,6 @@
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
   ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
 })
-@java.lang.Deprecated
 
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
index 550cd22b28b4..033e97881105 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -34,7 +34,6 @@
   Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
   Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
 })
-@java.lang.Deprecated
 
 public class Capitalization {
   public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
index 88e2134d59a1..569d7d08d590 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   Cat.JSON_PROPERTY_DECLAWED
 })
-@java.lang.Deprecated
 
 public class Cat extends Animal {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
index 792cf1e5ffb0..cc04e0e022d3 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   CatAllOf.JSON_PROPERTY_DECLAWED
 })
-@java.lang.Deprecated
 
 public class CatAllOf {
   public static final String JSON_PROPERTY_DECLAWED = "declawed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
index 860f8a8bfcf7..868ba8750742 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
@@ -30,7 +30,6 @@
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
index f66c25492fed..4de7664b26a7 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -30,7 +30,6 @@
 @JsonPropertyOrder({
   ClassModel.JSON_PROPERTY_PROPERTY_CLASS
 })
-@java.lang.Deprecated
 
 public class ClassModel {
   public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
index 45561a09adfd..02b0aac2247a 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   Client.JSON_PROPERTY_CLIENT
 })
-@java.lang.Deprecated
 
 public class Client {
   public static final String JSON_PROPERTY_CLIENT = "client";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
index 42d49af745db..78044654d500 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
@@ -31,7 +31,6 @@
 @JsonPropertyOrder({
   Dog.JSON_PROPERTY_BREED
 })
-@java.lang.Deprecated
 
 public class Dog extends Animal {
   public static final String JSON_PROPERTY_BREED = "breed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
index 76b217a78189..dd42595cf202 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   DogAllOf.JSON_PROPERTY_BREED
 })
-@java.lang.Deprecated
 
 public class DogAllOf {
   public static final String JSON_PROPERTY_BREED = "breed";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
index eade56a72fd8..aff182cd4983 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -32,7 +32,6 @@
   EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
   EnumArrays.JSON_PROPERTY_ARRAY_ENUM
 })
-@java.lang.Deprecated
 
 public class EnumArrays {
   /**
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
index 984cff54c84a..51a1a645a109 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -34,7 +34,6 @@
   EnumTest.JSON_PROPERTY_ENUM_NUMBER,
   EnumTest.JSON_PROPERTY_OUTER_ENUM
 })
-@java.lang.Deprecated
 
 public class EnumTest {
   /**
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index d37f06891160..8166597792d0 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -32,7 +32,6 @@
   FileSchemaTestClass.JSON_PROPERTY_FILE,
   FileSchemaTestClass.JSON_PROPERTY_FILES
 })
-@java.lang.Deprecated
 
 public class FileSchemaTestClass {
   public static final String JSON_PROPERTY_FILE = "file";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
index e8eaac93f906..4dee7f6c9dcc 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -47,7 +47,6 @@
   FormatTest.JSON_PROPERTY_PASSWORD,
   FormatTest.JSON_PROPERTY_BIG_DECIMAL
 })
-@java.lang.Deprecated
 
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index c1a5aaca5f98..0a3f0d464360 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -30,7 +30,6 @@
   HasOnlyReadOnly.JSON_PROPERTY_BAR,
   HasOnlyReadOnly.JSON_PROPERTY_FOO
 })
-@java.lang.Deprecated
 
 public class HasOnlyReadOnly {
   public static final String JSON_PROPERTY_BAR = "bar";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
index 007d621e3046..113f92dd9cbe 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
@@ -35,7 +35,6 @@
   MapTest.JSON_PROPERTY_DIRECT_MAP,
   MapTest.JSON_PROPERTY_INDIRECT_MAP
 })
-@java.lang.Deprecated
 
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 49b8d8e82fb7..d483d69700f8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,7 +37,6 @@
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
   MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
 })
-@java.lang.Deprecated
 
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
index be4d8830347c..dd99468a0059 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -31,7 +31,6 @@
   Model200Response.JSON_PROPERTY_NAME,
   Model200Response.JSON_PROPERTY_PROPERTY_CLASS
 })
-@java.lang.Deprecated
 
 public class Model200Response {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 272e12c244c8..383cafdd3a5a 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -31,7 +31,6 @@
   ModelApiResponse.JSON_PROPERTY_TYPE,
   ModelApiResponse.JSON_PROPERTY_MESSAGE
 })
-@java.lang.Deprecated
 
 public class ModelApiResponse {
   public static final String JSON_PROPERTY_CODE = "code";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
index 29942461de87..b62e13a90a0c 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -30,7 +30,6 @@
 @JsonPropertyOrder({
   ModelReturn.JSON_PROPERTY_RETURN
 })
-@java.lang.Deprecated
 
 public class ModelReturn {
   public static final String JSON_PROPERTY_RETURN = "return";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
index 111bad6b5b61..bd625c5f66f3 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
@@ -33,7 +33,6 @@
   Name.JSON_PROPERTY_PROPERTY,
   Name.JSON_PROPERTY_123NUMBER
 })
-@java.lang.Deprecated
 
 public class Name {
   public static final String JSON_PROPERTY_NAME = "name";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
index 366f62787ef6..5ca72a169fe8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -30,7 +30,6 @@
 @JsonPropertyOrder({
   NumberOnly.JSON_PROPERTY_JUST_NUMBER
 })
-@java.lang.Deprecated
 
 public class NumberOnly {
   public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
index 17a41e6ae5b7..d4f5f1c55bd0 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
@@ -35,7 +35,6 @@
   Order.JSON_PROPERTY_STATUS,
   Order.JSON_PROPERTY_COMPLETE
 })
-@java.lang.Deprecated
 
 public class Order {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
index 50306359002b..4d73ff2bbd6f 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -32,7 +32,6 @@
   OuterComposite.JSON_PROPERTY_MY_STRING,
   OuterComposite.JSON_PROPERTY_MY_BOOLEAN
 })
-@java.lang.Deprecated
 
 public class OuterComposite {
   public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
index ae2a084afdc8..be74dd5ca081 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
@@ -38,7 +38,6 @@
   Pet.JSON_PROPERTY_TAGS,
   Pet.JSON_PROPERTY_STATUS
 })
-@java.lang.Deprecated
 
 public class Pet {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 181e4df33f3b..b3e58ef3d2c5 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -30,7 +30,6 @@
   ReadOnlyFirst.JSON_PROPERTY_BAR,
   ReadOnlyFirst.JSON_PROPERTY_BAZ
 })
-@java.lang.Deprecated
 
 public class ReadOnlyFirst {
   public static final String JSON_PROPERTY_BAR = "bar";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 75b446949147..35ad3bf46994 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -29,7 +29,6 @@
 @JsonPropertyOrder({
   SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class SpecialModelName {
   public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
index 81b95bb8c135..a3ecb398faa3 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
@@ -30,7 +30,6 @@
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
-@java.lang.Deprecated
 
 public class Tag {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 6d084fc87d96..e5996f694682 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -36,7 +36,6 @@
   TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
 })
-@java.lang.Deprecated
 
 public class TypeHolderDefault {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index df37b48710bd..b7f141913e71 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -37,7 +37,6 @@
   TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
   TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
 })
-@java.lang.Deprecated
 
 public class TypeHolderExample {
   public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
index 434d95451472..b7e74643dab2 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
@@ -36,7 +36,6 @@
   User.JSON_PROPERTY_PHONE,
   User.JSON_PROPERTY_USER_STATUS
 })
-@java.lang.Deprecated
 
 public class User {
   public static final String JSON_PROPERTY_ID = "id";
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
index 62b86d1a4a83..65e7c295192b 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -60,7 +60,6 @@
   XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
   XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
 })
-@java.lang.Deprecated
 
 public class XmlItem {
   public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java
index 1a3b018cf08d..2a9c50e8ab82 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Category.java
@@ -18,7 +18,6 @@
   * A category for a pet
  **/
 @ApiModel(description="A category for a pet")
-
 public class Category  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 454a2f2f0b4a..8e0b124af4dc 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -18,7 +18,6 @@
   * Describes the result of uploading an image resource
  **/
 @ApiModel(description="Describes the result of uploading an image resource")
-
 public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java
index 7ec2480b9a47..cab33779ea61 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Order.java
@@ -19,7 +19,6 @@
   * An order for a pets from the pet store
  **/
 @ApiModel(description="An order for a pets from the pet store")
-
 public class Order  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java
index 1f56e1435878..6cbeaf819529 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Pet.java
@@ -22,7 +22,6 @@
   * A pet for sale in the pet store
  **/
 @ApiModel(description="A pet for sale in the pet store")
-
 public class Pet  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java
index 8d30130e25b7..10cbeef0e0a3 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/Tag.java
@@ -18,7 +18,6 @@
   * A tag for a pet
  **/
 @ApiModel(description="A tag for a pet")
-
 public class Tag  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java
index 6e73c2080cd7..b1d7d8b02512 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/src/gen/java/org/openapitools/model/User.java
@@ -18,7 +18,6 @@
   * A User who is purchasing from the pet store
  **/
 @ApiModel(description="A User who is purchasing from the pet store")
-
 public class User  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java
index 1a3b018cf08d..2a9c50e8ab82 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Category.java
@@ -18,7 +18,6 @@
   * A category for a pet
  **/
 @ApiModel(description="A category for a pet")
-
 public class Category  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java
index 454a2f2f0b4a..8e0b124af4dc 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -18,7 +18,6 @@
   * Describes the result of uploading an image resource
  **/
 @ApiModel(description="Describes the result of uploading an image resource")
-
 public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java
index 7ec2480b9a47..cab33779ea61 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Order.java
@@ -19,7 +19,6 @@
   * An order for a pets from the pet store
  **/
 @ApiModel(description="An order for a pets from the pet store")
-
 public class Order  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java
index 1f56e1435878..6cbeaf819529 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Pet.java
@@ -22,7 +22,6 @@
   * A pet for sale in the pet store
  **/
 @ApiModel(description="A pet for sale in the pet store")
-
 public class Pet  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java
index 8d30130e25b7..10cbeef0e0a3 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/Tag.java
@@ -18,7 +18,6 @@
   * A tag for a pet
  **/
 @ApiModel(description="A tag for a pet")
-
 public class Tag  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java
index 6e73c2080cd7..b1d7d8b02512 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/src/gen/java/org/openapitools/model/User.java
@@ -18,7 +18,6 @@
   * A User who is purchasing from the pet store
  **/
 @ApiModel(description="A User who is purchasing from the pet store")
-
 public class User  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 815b0d747a81..f7b51130bdc5 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 75b56431e060..d56c2d73f0bb 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesArray extends HashMap<String, List> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 13ae9555aa38..c055eeff77cb 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index 6c0b08f6fad0..964f668d2c34 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -17,7 +17,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesClass  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 6bf461a1bc54..74f201910f5f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 933d668f84cb..f99b0a19676a 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index ef8deaf235c0..fc4351c39f69 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index 0520c61a46a3..2f762755b1d6 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class AdditionalPropertiesString extends HashMap<String, String> {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java
index f810fee9cb20..cac03555be3d 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Animal.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 @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/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 9821ec0e41aa..8d71e8d68439 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class ArrayOfArrayOfNumberOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 44575d6843ce..4f0dcee51e43 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class ArrayOfNumberOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java
index d80b78e8d2c1..38dc1305f797 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class ArrayTest  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java
index ceb7ac8b7d2f..28121b91cb7e 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Capitalization.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Capitalization  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java
index a954f1c24ba9..547b056c8791 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Cat.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Cat extends Animal {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java
index 91492b23cde8..30cb0e823afe 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class CatAllOf  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java
index f3d2afcf7b48..a445fd2ab43b 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Category.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Category  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java
index 1d13e286e3a9..7002f7449b6c 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ClassModel.java
@@ -18,7 +18,6 @@
   * Model for testing model with \"_class\" property
  **/
 @ApiModel(description="Model for testing model with \"_class\" property")
-
 public class ClassModel  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java
index a9f512a7e35f..6741eddce5ce 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Client.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Client  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java
index 01b20dc63d88..48355040aa86 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Dog.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Dog extends Animal {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java
index a43c1a6f73e0..0a7fec88949b 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class DogAllOf  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java
index fa51ad2a656f..838558304e8d 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class EnumArrays  {
   
 @XmlType(name="JustSymbolEnum")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java
index ee56f20a1fb9..c50bae5b58fc 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class EnumTest  {
   
 @XmlType(name="EnumStringEnum")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 30733a926540..50f7d73ed0d5 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class FileSchemaTestClass  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
index 41973ea254cd..f68bfe9b7338 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
@@ -18,7 +18,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class FormatTest  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index eb946cf4250f..4323df53511e 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class HasOnlyReadOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java
index 47ca811359fd..c5a9c993fee2 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class MapTest  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 97fdce3bf2e8..9210f0d5db6f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -19,7 +19,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java
index 64539f4429ae..acfc8f9dfe2e 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Model200Response.java
@@ -18,7 +18,6 @@
   * Model for testing model name starting with number
  **/
 @ApiModel(description="Model for testing model name starting with number")
-
 public class Model200Response  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java
index bd2737c08def..339319ddc2ba 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class ModelApiResponse  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java
index 731a9423ee48..75dbf706c586 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -18,7 +18,6 @@
   * Model for testing reserved words
  **/
 @ApiModel(description="Model for testing reserved words")
-
 public class ModelReturn  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java
index ff5aa3dce2a1..2f9750b4f38f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Name.java
@@ -18,7 +18,6 @@
   * Model for testing model name same as property name
  **/
 @ApiModel(description="Model for testing model name same as property name")
-
 public class Name  {
   
   @ApiModelProperty(required = true, value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java
index 5b1e142f0e0c..3d61c8c76f22 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -14,7 +14,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class NumberOnly  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java
index 84177b67734d..396dae890efd 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Order.java
@@ -14,7 +14,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Order  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java
index 29bd3d9276ab..02e622d85fbc 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -14,7 +14,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class OuterComposite  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java
index 28097af56fe4..3042dd056482 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Pet.java
@@ -17,7 +17,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Pet  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 695e9eedfe17..fd9bd949729e 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class ReadOnlyFirst  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java
index be157626af5c..ef23af3fecc9 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class SpecialModelName  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java
index ca702d01bcfa..268e6f27211b 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/Tag.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class Tag  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 7b6d97264a49..ace8f6a23bd2 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class TypeHolderDefault  {
   
   @ApiModelProperty(required = true, value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java
index 73134c60c80e..04715a41c388 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class TypeHolderExample  {
   
   @ApiModelProperty(example = "what", required = true, value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java
index f54c8682ae01..af204eab8a80 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/User.java
@@ -13,7 +13,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class User  {
   
   @ApiModelProperty(value = "")
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java
index c9c7d0c9a90a..d12a3515382e 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/XmlItem.java
@@ -16,7 +16,6 @@
 import javax.xml.bind.annotation.XmlEnumValue;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class XmlItem  {
   
   @ApiModelProperty(example = "string", value = "")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index e0850d37251e..448c77cea931 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesAnyType
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 9df672b67d30..a80499fd79b9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,6 @@
 /**
  * AdditionalPropertiesArray
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 4ac7040d05b7..d8db9baf3105 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesBoolean
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index ec45806cc76f..b7f58b90fa6b 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,6 @@
 /**
  * AdditionalPropertiesClass
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 4ae5a8206bba..b94e539aa3f2 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesInteger
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8df9b8b988e4..c33e1e3b7a21 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,6 @@
 /**
  * AdditionalPropertiesNumber
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 086b6790396a..cab0c80d9b4c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesObject
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index b9894ee6ea82..894eb466b4cc 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesString
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
index 385e01b9d9df..68d2e740966b 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Animal.java
@@ -20,7 +20,6 @@
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
-@java.lang.Deprecated
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 9942a0c3ff28..d4aeef01b3e3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,6 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-@java.lang.Deprecated
 
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index d9e6951d3c2a..b2da4b9b26a6 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,6 @@
 /**
  * ArrayOfNumberOnly
  */
-@java.lang.Deprecated
 
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
index dc65c4e3c64c..fb134a8c4419 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,6 @@
 /**
  * ArrayTest
  */
-@java.lang.Deprecated
 
 public class ArrayTest   {
   @JsonProperty("array_of_string")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
index 14ce46bd562c..e1346fe63ea8 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,6 @@
 /**
  * Capitalization
  */
-@java.lang.Deprecated
 
 public class Capitalization   {
   @JsonProperty("smallCamel")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
index f8098869bc95..f6d3c17d0be3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,6 @@
 /**
  * Cat
  */
-@java.lang.Deprecated
 
 public class Cat extends Animal  {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
index 1df4f5a43f27..cf145ae53718 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,6 @@
 /**
  * CatAllOf
  */
-@java.lang.Deprecated
 
 public class CatAllOf   {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
index 3775a84a57d4..db3f8e08dc0d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,6 @@
 /**
  * Category
  */
-@java.lang.Deprecated
 
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
index 3cad79a81688..ba96dc2add68 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,6 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-@java.lang.Deprecated
 
 public class ClassModel   {
   @JsonProperty("_class")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
index 6d542859d2a9..59d479c85336 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,6 @@
 /**
  * Client
  */
-@java.lang.Deprecated
 
 public class Client   {
   @JsonProperty("client")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
index f6d7eaff0cc7..02e027c3feea 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,6 @@
 /**
  * Dog
  */
-@java.lang.Deprecated
 
 public class Dog extends Animal  {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
index c1a705af3d2d..a1c4c17d8907 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,6 @@
 /**
  * DogAllOf
  */
-@java.lang.Deprecated
 
 public class DogAllOf   {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
index 61ba2a5acb53..3c0ea1ea75a5 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,6 @@
 /**
  * EnumArrays
  */
-@java.lang.Deprecated
 
 public class EnumArrays   {
   /**
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
index 6646441cf43a..7c93e03bbb00 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,6 @@
 /**
  * EnumTest
  */
-@java.lang.Deprecated
 
 public class EnumTest   {
   /**
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 8fc1a4d3e150..2e88258ce75c 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,6 @@
 /**
  * FileSchemaTestClass
  */
-@java.lang.Deprecated
 
 public class FileSchemaTestClass   {
   @JsonProperty("file")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
index b0628cee8164..c2ca28b35414 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,6 @@
 /**
  * FormatTest
  */
-@java.lang.Deprecated
 
 public class FormatTest   {
   @JsonProperty("integer")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 83e417a174c8..c0e7dd75528e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,6 @@
 /**
  * HasOnlyReadOnly
  */
-@java.lang.Deprecated
 
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
index 67fa02bea999..19a6db9cb155 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,6 @@
 /**
  * MapTest
  */
-@java.lang.Deprecated
 
 public class MapTest   {
   @JsonProperty("map_map_of_string")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index bd91ab783ea0..6f7a0b5d56e3 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,6 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@java.lang.Deprecated
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
index 61ed52dd0903..04606fb90460 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,6 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-@java.lang.Deprecated
 
 public class Model200Response   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index 52d5a22c1858..1d385b21bd4d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,6 @@
 /**
  * ModelApiResponse
  */
-@java.lang.Deprecated
 
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
index f010d99aac08..82026635f5cb 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,6 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@java.lang.Deprecated
 
 public class ModelReturn   {
   @JsonProperty("return")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
index 9ef5bbe6c6ab..1180f019ea3f 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,6 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-@java.lang.Deprecated
 
 public class Name   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
index 23e666dd9bcc..4423a2ac631d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,6 @@
 /**
  * NumberOnly
  */
-@java.lang.Deprecated
 
 public class NumberOnly   {
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
index ebb886d7d8ac..c45d3e54504e 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,6 @@
 /**
  * Order
  */
-@java.lang.Deprecated
 
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
index 1d6c42cfeab2..61dbaaefeeae 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,6 @@
 /**
  * OuterComposite
  */
-@java.lang.Deprecated
 
 public class OuterComposite   {
   @JsonProperty("my_number")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
index d4645ffd4750..5bea5f27a195 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Pet.java
@@ -17,7 +17,6 @@
 /**
  * Pet
  */
-@java.lang.Deprecated
 
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 666e6aa71591..4e1c3e681095 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,6 @@
 /**
  * ReadOnlyFirst
  */
-@java.lang.Deprecated
 
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
index e8b8d72dc6d9..6c0bfa749d3d 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,6 @@
 /**
  * SpecialModelName
  */
-@java.lang.Deprecated
 
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
index aa0ff8f19eea..c72064ce0428 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,6 @@
 /**
  * Tag
  */
-@java.lang.Deprecated
 
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
index dd907d281509..7dd51d7ccd56 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,6 @@
 /**
  * TypeHolderDefault
  */
-@java.lang.Deprecated
 
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
index 41be6fea6a29..c1f4cbd00a72 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,6 @@
 /**
  * TypeHolderExample
  */
-@java.lang.Deprecated
 
 public class TypeHolderExample   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
index 6a9351d99d46..d195089778a9 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,6 @@
 /**
  * User
  */
-@java.lang.Deprecated
 
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
index 1ca37fc9e1ec..dae97d794675 100644
--- a/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-mvc-j8-async/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,6 @@
 /**
  * XmlItem
  */
-@java.lang.Deprecated
 
 public class XmlItem   {
   @JsonProperty("attribute_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index e0850d37251e..448c77cea931 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesAnyType
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesAnyType extends HashMap<String, Object>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 9df672b67d30..a80499fd79b9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -15,7 +15,6 @@
 /**
  * AdditionalPropertiesArray
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesArray extends HashMap<String, List>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 4ac7040d05b7..d8db9baf3105 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesBoolean
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 7557170fc8bd..b9d1c52f961a 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -16,7 +16,6 @@
 /**
  * AdditionalPropertiesClass
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesClass   {
   @JsonProperty("map_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 4ae5a8206bba..b94e539aa3f2 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesInteger
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesInteger extends HashMap<String, Integer>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8df9b8b988e4..c33e1e3b7a21 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -15,7 +15,6 @@
 /**
  * AdditionalPropertiesNumber
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 086b6790396a..cab0c80d9b4c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesObject
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesObject extends HashMap<String, Map>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index b9894ee6ea82..894eb466b4cc 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -14,7 +14,6 @@
 /**
  * AdditionalPropertiesString
  */
-@java.lang.Deprecated
 
 public class AdditionalPropertiesString extends HashMap<String, String>  {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
index 385e01b9d9df..68d2e740966b 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Animal.java
@@ -20,7 +20,6 @@
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
 })
-@java.lang.Deprecated
 
 public class Animal   {
   @JsonProperty("className")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 43338885e403..a1fe8166abf8 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -15,7 +15,6 @@
 /**
  * ArrayOfArrayOfNumberOnly
  */
-@java.lang.Deprecated
 
 public class ArrayOfArrayOfNumberOnly   {
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index d05ce1801466..a76320466a38 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -15,7 +15,6 @@
 /**
  * ArrayOfNumberOnly
  */
-@java.lang.Deprecated
 
 public class ArrayOfNumberOnly   {
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
index fb41a4043bd1..df4610324400 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ArrayTest.java
@@ -15,7 +15,6 @@
 /**
  * ArrayTest
  */
-@java.lang.Deprecated
 
 public class ArrayTest   {
   @JsonProperty("array_of_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
index 14ce46bd562c..e1346fe63ea8 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Capitalization.java
@@ -12,7 +12,6 @@
 /**
  * Capitalization
  */
-@java.lang.Deprecated
 
 public class Capitalization   {
   @JsonProperty("smallCamel")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
index f8098869bc95..f6d3c17d0be3 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Cat.java
@@ -14,7 +14,6 @@
 /**
  * Cat
  */
-@java.lang.Deprecated
 
 public class Cat extends Animal  {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
index 1df4f5a43f27..cf145ae53718 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/CatAllOf.java
@@ -12,7 +12,6 @@
 /**
  * CatAllOf
  */
-@java.lang.Deprecated
 
 public class CatAllOf   {
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
index 3775a84a57d4..db3f8e08dc0d 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Category.java
@@ -12,7 +12,6 @@
 /**
  * Category
  */
-@java.lang.Deprecated
 
 public class Category   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
index 3cad79a81688..ba96dc2add68 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ClassModel.java
@@ -13,7 +13,6 @@
  * Model for testing model with \&quot;_class\&quot; property
  */
 @ApiModel(description = "Model for testing model with \"_class\" property")
-@java.lang.Deprecated
 
 public class ClassModel   {
   @JsonProperty("_class")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
index 6d542859d2a9..59d479c85336 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Client.java
@@ -12,7 +12,6 @@
 /**
  * Client
  */
-@java.lang.Deprecated
 
 public class Client   {
   @JsonProperty("client")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
index f6d7eaff0cc7..02e027c3feea 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Dog.java
@@ -14,7 +14,6 @@
 /**
  * Dog
  */
-@java.lang.Deprecated
 
 public class Dog extends Animal  {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
index c1a705af3d2d..a1c4c17d8907 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/DogAllOf.java
@@ -12,7 +12,6 @@
 /**
  * DogAllOf
  */
-@java.lang.Deprecated
 
 public class DogAllOf   {
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
index 53d41933ab78..9592f35f25a1 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumArrays.java
@@ -15,7 +15,6 @@
 /**
  * EnumArrays
  */
-@java.lang.Deprecated
 
 public class EnumArrays   {
   /**
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
index 6646441cf43a..7c93e03bbb00 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/EnumTest.java
@@ -14,7 +14,6 @@
 /**
  * EnumTest
  */
-@java.lang.Deprecated
 
 public class EnumTest   {
   /**
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 1a837bfbcc35..ab7b747bf2fa 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -14,7 +14,6 @@
 /**
  * FileSchemaTestClass
  */
-@java.lang.Deprecated
 
 public class FileSchemaTestClass   {
   @JsonProperty("file")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
index 6b6e6534715e..e0887e113301 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,6 @@
 /**
  * FormatTest
  */
-@java.lang.Deprecated
 
 public class FormatTest   {
   @JsonProperty("integer")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 83e417a174c8..c0e7dd75528e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -12,7 +12,6 @@
 /**
  * HasOnlyReadOnly
  */
-@java.lang.Deprecated
 
 public class HasOnlyReadOnly   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
index 5e04511f6fb6..7a4421206d0e 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MapTest.java
@@ -16,7 +16,6 @@
 /**
  * MapTest
  */
-@java.lang.Deprecated
 
 public class MapTest   {
   @JsonProperty("map_map_of_string")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6fab2e00d49b..6c0fe72d4773 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -18,7 +18,6 @@
 /**
  * MixedPropertiesAndAdditionalPropertiesClass
  */
-@java.lang.Deprecated
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
index 61ed52dd0903..04606fb90460 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Model200Response.java
@@ -13,7 +13,6 @@
  * Model for testing model name starting with number
  */
 @ApiModel(description = "Model for testing model name starting with number")
-@java.lang.Deprecated
 
 public class Model200Response   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
index 52d5a22c1858..1d385b21bd4d 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,7 +12,6 @@
 /**
  * ModelApiResponse
  */
-@java.lang.Deprecated
 
 public class ModelApiResponse   {
   @JsonProperty("code")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
index f010d99aac08..82026635f5cb 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ModelReturn.java
@@ -13,7 +13,6 @@
  * Model for testing reserved words
  */
 @ApiModel(description = "Model for testing reserved words")
-@java.lang.Deprecated
 
 public class ModelReturn   {
   @JsonProperty("return")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
index 9ef5bbe6c6ab..1180f019ea3f 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Name.java
@@ -13,7 +13,6 @@
  * Model for testing model name same as property name
  */
 @ApiModel(description = "Model for testing model name same as property name")
-@java.lang.Deprecated
 
 public class Name   {
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
index 23e666dd9bcc..4423a2ac631d 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/NumberOnly.java
@@ -13,7 +13,6 @@
 /**
  * NumberOnly
  */
-@java.lang.Deprecated
 
 public class NumberOnly   {
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
index 09e7888cf046..85e3c108d488 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Order.java
@@ -14,7 +14,6 @@
 /**
  * Order
  */
-@java.lang.Deprecated
 
 public class Order   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
index 1d6c42cfeab2..61dbaaefeeae 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/OuterComposite.java
@@ -13,7 +13,6 @@
 /**
  * OuterComposite
  */
-@java.lang.Deprecated
 
 public class OuterComposite   {
   @JsonProperty("my_number")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
index d8123892f25f..1fab3a2e1238 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Pet.java
@@ -17,7 +17,6 @@
 /**
  * Pet
  */
-@java.lang.Deprecated
 
 public class Pet   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 666e6aa71591..4e1c3e681095 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -12,7 +12,6 @@
 /**
  * ReadOnlyFirst
  */
-@java.lang.Deprecated
 
 public class ReadOnlyFirst   {
   @JsonProperty("bar")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
index e8b8d72dc6d9..6c0bfa749d3d 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -12,7 +12,6 @@
 /**
  * SpecialModelName
  */
-@java.lang.Deprecated
 
 public class SpecialModelName   {
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
index aa0ff8f19eea..c72064ce0428 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/Tag.java
@@ -12,7 +12,6 @@
 /**
  * Tag
  */
-@java.lang.Deprecated
 
 public class Tag   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 10c868547f4b..b88e00b47d78 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -15,7 +15,6 @@
 /**
  * TypeHolderDefault
  */
-@java.lang.Deprecated
 
 public class TypeHolderDefault   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
index f5b4bbec5104..85694fed2185 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -15,7 +15,6 @@
 /**
  * TypeHolderExample
  */
-@java.lang.Deprecated
 
 public class TypeHolderExample   {
   @JsonProperty("string_item")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
index 6a9351d99d46..d195089778a9 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/User.java
@@ -12,7 +12,6 @@
 /**
  * User
  */
-@java.lang.Deprecated
 
 public class User   {
   @JsonProperty("id")
diff --git a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
index 95e8e19e1eb6..ca74cfcfd91c 100644
--- a/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-mvc/src/main/java/org/openapitools/model/XmlItem.java
@@ -15,7 +15,6 @@
 /**
  * XmlItem
  */
-@java.lang.Deprecated
 
 public class XmlItem   {
   @JsonProperty("attribute_string")
diff --git a/update_all.sh b/update_all.sh
deleted file mode 100644
index 5cfc21d25d7d..000000000000
--- a/update_all.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-./bin/ruby-client-petstore.sh
-./bin/openapi3/ruby-client-petstore.sh
-./bin/openapi3/ruby-client-faraday-petstore.sh
-./bin/java-petstore-all.sh
-./bin/java-jaxrs-petstore-server-all.sh
-./bin/java-msf4j-petstore-server.sh
-./bin/openapi3/jaxrs-jersey-petstore.sh
-./bin/spring-all-petstore.sh
-./bin/javascript-petstore-all.sh
-./bin/kotlin-client-petstore-multiplatform.sh
-./bin/kotlin-client-petstore.sh
-./bin/kotlin-client-string.sh
-./bin/kotlin-client-threetenbp.sh
-./bin/kotlin-server-petstore.sh
-./bin/kotlin-springboot-petstore-server.sh
-./bin/kotlin-springboot-petstore-server-reactive.sh
-./bin/mysql-schema-petstore.sh
-./bin/nim-client-petstore.sh
-./bin/python-petstore-all.sh
-./bin/openapi3/python-petstore.sh
-./bin/php-petstore.sh
-./bin/php-silex-petstore-server.sh
-./bin/php-symfony-petstore.sh
-./bin/php-lumen-petstore-server.sh
-./bin/php-slim-server-petstore.sh
-./bin/php-ze-ph-petstore-server.sh
-./bin/openapi3/php-petstore.sh
-./bin/typescript-angularjs-petstore.sh
-./bin/typescript-angular-petstore-all.sh
-./bin/typescript-aurelia-petstore.sh
-./bin/typescript-axios-petstore-all.sh
-./bin/typescript-fetch-petstore-all.sh
-./bin/typescript-inversify-petstore.sh
-./bin/typescript-jquery-petstore-all.sh
-./bin/typescript-node-petstore-all.sh
-./bin/typescript-rxjs-petstore-all.sh
-./bin/rust-server-petstore.sh
-./bin/r-petstore.sh
-./bin/haskell-http-client-petstore.sh
-./bin/csharp-petstore.sh
-./bin/csharp-netcore-petstore-all.sh
-./bin/elixir-petstore.sh
-./bin/openapi3/go-petstore.sh
-./bin/go-experimental-petstore.sh
-./bin/go-petstore.sh
-./bin/go-petstore-withxml.sh
-./bin/go-gin-petstore-server.sh
-./bin/groovy-petstore.sh
-./bin/apex-petstore.sh
-./bin/perl-petstore-all.sh
-./bin/dart-jaguar-petstore.sh
-./bin/dart-petstore.sh
-./bin/dart2-petstore.sh
-./bin/java-play-framework-petstore-server-all.sh
-#./bin/elm-petstore-all.sh
-./bin/meta-codegen.sh
-# OTHERS
-./bin/utils/export_docs_generators.sh
-./bin/utils/copy-to-website.sh
-./bin/utils/export_generators_readme.sh
\ No newline at end of file