From 8bed1702138b2c415cf46208e223d02863f16610 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Wed, 9 Jun 2021 00:07:20 +0800
Subject: [PATCH 1/2] update logback to 2.1.0

---
 .../src/main/resources/Java/libraries/microprofile/pom.mustache | 2 +-
 .../src/main/resources/JavaJaxRS/cxf-ext/pom.mustache           | 2 +-
 .../src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache    | 2 +-
 .../src/main/resources/JavaJaxRS/cxf/pom.mustache               | 2 +-
 .../src/main/resources/JavaJaxRS/cxf/server/pom.mustache        | 2 +-
 .../openapi-generator/src/main/resources/JavaJaxRS/pom.mustache | 2 +-
 .../src/main/resources/java-undertow-server/pom.mustache        | 2 +-
 samples/client/petstore/java/microprofile-rest-client/pom.xml   | 2 +-
 samples/server/petstore/java-undertow/pom.xml                   | 2 +-
 samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml   | 2 +-
 samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml        | 2 +-
 samples/server/petstore/jaxrs-cxf/pom.xml                       | 2 +-
 samples/server/petstore/jaxrs-datelib-j8/pom.xml                | 2 +-
 samples/server/petstore/jaxrs-jersey/pom.xml                    | 2 +-
 samples/server/petstore/jaxrs/jersey2-useTags/pom.xml           | 2 +-
 samples/server/petstore/jaxrs/jersey2/pom.xml                   | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
index 63321ae28bb..b43a110aed7 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache
@@ -170,7 +170,7 @@
     <swagger-core-version>1.5.18</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache
index a0e068f8ce5..e9df52a01a6 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache
@@ -207,7 +207,7 @@
     <swagger-core-version>1.5.22</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache
index eabc448d6b2..8cb82501d51 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache
@@ -338,7 +338,7 @@
 {{/generateSpringApplication}}    
 {{^generateSpringBootApplication}}
     <junit-version>4.13</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
 {{/generateSpringBootApplication}}
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
index d1596f47265..493fd683cf9 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/pom.mustache
@@ -207,7 +207,7 @@
     <swagger-core-version>1.5.18</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
index 9d8c6df2b59..28a678bb612 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -258,7 +258,7 @@
     <swagger-core-version>1.5.22</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache
index 8951701707d..dc2a043addb 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache
@@ -218,7 +218,7 @@
     <commons_lang3_version>3.5</commons_lang3_version>
   {{/supportJava6}}
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
index b1459f92a78..9ad7d579940 100644
--- a/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
@@ -26,7 +26,7 @@
         <version.commons.codec>1.10</version.commons.codec>
         <version.encoder>1.2</version.encoder>
         <version.metrics>3.1.2</version.metrics>
-        <version.logback>1.1.7</version.logback>
+        <version.logback>1.2.0</version.logback>
         <version.junit>4.13</version.junit>
         <version.mockito>2.1.0-beta.124</version.mockito>
         <version.undertow>1.4.0.Final</version.undertow>
diff --git a/samples/client/petstore/java/microprofile-rest-client/pom.xml b/samples/client/petstore/java/microprofile-rest-client/pom.xml
index 5faf0c0c062..91b6ef610f5 100644
--- a/samples/client/petstore/java/microprofile-rest-client/pom.xml
+++ b/samples/client/petstore/java/microprofile-rest-client/pom.xml
@@ -141,7 +141,7 @@
     <swagger-core-version>1.5.18</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.2.7</cxf-version>
     <jackson-jaxrs-version>2.9.7</jackson-jaxrs-version>
diff --git a/samples/server/petstore/java-undertow/pom.xml b/samples/server/petstore/java-undertow/pom.xml
index 2382e40a66e..53ccffba47d 100644
--- a/samples/server/petstore/java-undertow/pom.xml
+++ b/samples/server/petstore/java-undertow/pom.xml
@@ -26,7 +26,7 @@
         <version.commons.codec>1.10</version.commons.codec>
         <version.encoder>1.2</version.encoder>
         <version.metrics>3.1.2</version.metrics>
-        <version.logback>1.1.7</version.logback>
+        <version.logback>1.2.0</version.logback>
         <version.junit>4.13</version.junit>
         <version.mockito>2.1.0-beta.124</version.mockito>
         <version.undertow>1.4.0.Final</version.undertow>
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
index 7a0ffeda6b4..6e3398ecdf8 100644
--- a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
@@ -200,7 +200,7 @@
     <swagger-core-version>1.5.22</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
index b969ba62f50..cf1b6b22218 100644
--- a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
@@ -200,7 +200,7 @@
     <swagger-core-version>1.5.22</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml
index a98a3d7b11f..9403958f983 100644
--- a/samples/server/petstore/jaxrs-cxf/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf/pom.xml
@@ -200,7 +200,7 @@
     <swagger-core-version>1.5.22</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.3.0</cxf-version>
diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
index c183185efec..56dda9ce81e 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml
+++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
@@ -186,7 +186,7 @@
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.9.9</jackson-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/samples/server/petstore/jaxrs-jersey/pom.xml b/samples/server/petstore/jaxrs-jersey/pom.xml
index 5087e5621c3..242055058d7 100644
--- a/samples/server/petstore/jaxrs-jersey/pom.xml
+++ b/samples/server/petstore/jaxrs-jersey/pom.xml
@@ -186,7 +186,7 @@
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.9.9</jackson-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml
index d534555f77d..68907b27d0d 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml
@@ -186,7 +186,7 @@
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.9.9</jackson-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml
index 3acc7ea707b..9f547514d92 100644
--- a/samples/server/petstore/jaxrs/jersey2/pom.xml
+++ b/samples/server/petstore/jaxrs/jersey2/pom.xml
@@ -186,7 +186,7 @@
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.9.9</jackson-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-- 
GitLab


From 2345352c4b73519991142d3e7702d333dfe9f1f3 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Wed, 9 Jun 2021 00:11:08 +0800
Subject: [PATCH 2/2] udpate jax-rs samples

---
 .../.openapi-generator/VERSION                |   2 +-
 .../petstore/jaxrs-cxf-client-jackson/pom.xml |   2 +-
 .../.openapi-generator/VERSION                |   2 +-
 .../client/petstore/jaxrs-cxf-client/pom.xml  |   4 +-
 .../.openapi-generator/VERSION                |   2 +-
 .../petstore/jaxrs-cxf-test-data/pom.xml      |   2 +-
 .../java/org/openapitools/api/FakeApi.java    |  26 ++--
 .../gen/java/org/openapitools/api/PetApi.java |  16 +--
 .../java/org/openapitools/api/StoreApi.java   |   6 +-
 .../java/org/openapitools/api/UserApi.java    |  14 +--
 .../java/org/openapitools/model/Animal.java   |   4 +-
 .../java/org/openapitools/model/BigCat.java   |   2 +
 .../org/openapitools/model/BigCatAllOf.java   |   2 +
 .../org/openapitools/model/EnumArrays.java    |   2 +
 .../java/org/openapitools/model/EnumTest.java |   2 +
 .../org/openapitools/model/FormatTest.java    |   1 +
 .../java/org/openapitools/model/MapTest.java  |   2 +
 .../java/org/openapitools/model/Order.java    |   2 +
 .../gen/java/org/openapitools/model/Pet.java  |   2 +
 .../.openapi-generator/VERSION                |   2 +-
 .../jaxrs-spec-interface-response/pom.xml     |   2 +-
 .../org/openapitools/api/AnotherFakeApi.java  |   2 +-
 .../java/org/openapitools/api/FakeApi.java    |  46 +++----
 .../api/FakeClassnameTestApi.java             |   5 +-
 .../gen/java/org/openapitools/api/PetApi.java |  42 +++----
 .../java/org/openapitools/api/StoreApi.java   |   9 +-
 .../java/org/openapitools/api/UserApi.java    |  22 ++--
 .../model/AdditionalPropertiesAnyType.java    |   1 +
 .../model/AdditionalPropertiesArray.java      |   1 +
 .../model/AdditionalPropertiesBoolean.java    |   1 +
 .../model/AdditionalPropertiesClass.java      |  41 +++++--
 .../model/AdditionalPropertiesInteger.java    |   1 +
 .../model/AdditionalPropertiesNumber.java     |   1 +
 .../model/AdditionalPropertiesObject.java     |   1 +
 .../model/AdditionalPropertiesString.java     |   1 +
 .../java/org/openapitools/model/Animal.java   |   9 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |   1 +
 .../openapitools/model/ArrayOfNumberOnly.java |   1 +
 .../org/openapitools/model/ArrayTest.java     |   9 +-
 .../java/org/openapitools/model/BigCat.java   |   1 +
 .../org/openapitools/model/BigCatAllOf.java   |   1 +
 .../openapitools/model/Capitalization.java    |  21 +++-
 .../gen/java/org/openapitools/model/Cat.java  |   1 +
 .../java/org/openapitools/model/CatAllOf.java |   1 +
 .../java/org/openapitools/model/Category.java |   5 +-
 .../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    |   5 +-
 .../java/org/openapitools/model/EnumTest.java |  17 ++-
 .../model/FileSchemaTestClass.java            |   5 +-
 .../org/openapitools/model/FormatTest.java    |  53 ++++++--
 .../openapitools/model/HasOnlyReadOnly.java   |   5 +-
 .../java/org/openapitools/model/MapTest.java  |  13 +-
 ...ropertiesAndAdditionalPropertiesClass.java |   9 +-
 .../openapitools/model/Model200Response.java  |   5 +-
 .../openapitools/model/ModelApiResponse.java  |   9 +-
 .../org/openapitools/model/ModelReturn.java   |   1 +
 .../gen/java/org/openapitools/model/Name.java |  13 +-
 .../org/openapitools/model/NumberOnly.java    |   1 +
 .../java/org/openapitools/model/Order.java    |  21 +++-
 .../openapitools/model/OuterComposite.java    |   9 +-
 .../gen/java/org/openapitools/model/Pet.java  |  21 +++-
 .../org/openapitools/model/ReadOnlyFirst.java |   5 +-
 .../openapitools/model/SpecialModelName.java  |   1 +
 .../gen/java/org/openapitools/model/Tag.java  |   5 +-
 .../openapitools/model/TypeHolderDefault.java |  17 ++-
 .../openapitools/model/TypeHolderExample.java |  21 +++-
 .../gen/java/org/openapitools/model/User.java |  29 +++--
 .../java/org/openapitools/model/XmlItem.java  | 113 +++++++++++++-----
 .../src/main/openapi/openapi.yaml             |   4 +
 72 files changed, 492 insertions(+), 217 deletions(-)

diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/.openapi-generator/VERSION b/samples/client/petstore/jaxrs-cxf-client-jackson/.openapi-generator/VERSION
index d99e7162d01..6555596f931 100644
--- a/samples/client/petstore/jaxrs-cxf-client-jackson/.openapi-generator/VERSION
+++ b/samples/client/petstore/jaxrs-cxf-client-jackson/.openapi-generator/VERSION
@@ -1 +1 @@
-5.0.0-SNAPSHOT
\ No newline at end of file
+5.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml
index e2d463a2cfe..aa59537336d 100644
--- a/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml
+++ b/samples/client/petstore/jaxrs-cxf-client-jackson/pom.xml
@@ -171,7 +171,7 @@
     <swagger-core-version>1.5.18</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
diff --git a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
index d99e7162d01..6555596f931 100644
--- a/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
+++ b/samples/client/petstore/jaxrs-cxf-client/.openapi-generator/VERSION
@@ -1 +1 @@
-5.0.0-SNAPSHOT
\ No newline at end of file
+5.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml
index e3f53e0f7ba..fe612296899 100644
--- a/samples/client/petstore/jaxrs-cxf-client/pom.xml
+++ b/samples/client/petstore/jaxrs-cxf-client/pom.xml
@@ -170,8 +170,8 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.18</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
-    <junit-version>4.13</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <junit-version>4.13.1</junit-version>
+    <logback-version>1.2.0</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.3.0</cxf-version>
     <jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/VERSION
index d99e7162d01..6555596f931 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-cxf-test-data/.openapi-generator/VERSION
@@ -1 +1 @@
-5.0.0-SNAPSHOT
\ No newline at end of file
+5.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/pom.xml b/samples/server/petstore/jaxrs-cxf-test-data/pom.xml
index 649cf9d0e98..f17dde84bad 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-test-data/pom.xml
@@ -233,7 +233,7 @@
     <dependency>
       <groupId>org.openapitools</groupId>
       <artifactId>openapi-generator</artifactId>
-      <version>5.0.0-SNAPSHOT</version>
+      <version>5.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <repositories>
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java
index 35c97ab755a..21065b6fc8b 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/FakeApi.java
@@ -48,7 +48,7 @@ public interface FakeApi  {
     @POST
     @Path("/create_xml_item")
     @Consumes({ "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" })
-    @ApiOperation(value = "creates an XmlItem", tags={ "fake",  })
+    @ApiOperation(value = "creates an XmlItem", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     public void createXmlItem(@Valid XmlItem xmlItem);
@@ -57,7 +57,7 @@ public interface FakeApi  {
     @Path("/outer/boolean")
     @Consumes({ "text/plain" })
     @Produces({ "*/*" })
-    @ApiOperation(value = "", tags={ "fake",  })
+    @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
     public Boolean fakeOuterBooleanSerialize(@Valid Boolean body);
@@ -66,7 +66,7 @@ public interface FakeApi  {
     @Path("/outer/composite")
     @Consumes({ "application/json" })
     @Produces({ "*/*" })
-    @ApiOperation(value = "", tags={ "fake",  })
+    @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
     public OuterComposite fakeOuterCompositeSerialize(@Valid OuterComposite body);
@@ -75,7 +75,7 @@ public interface FakeApi  {
     @Path("/outer/number")
     @Consumes({ "text/plain" })
     @Produces({ "*/*" })
-    @ApiOperation(value = "", tags={ "fake",  })
+    @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
     public BigDecimal fakeOuterNumberSerialize(@Valid BigDecimal body);
@@ -84,7 +84,7 @@ public interface FakeApi  {
     @Path("/outer/string")
     @Consumes({ "text/plain" })
     @Produces({ "*/*" })
-    @ApiOperation(value = "", tags={ "fake",  })
+    @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
     public String fakeOuterStringSerialize(@Valid String body);
@@ -92,7 +92,7 @@ public interface FakeApi  {
     @PUT
     @Path("/body-with-file-schema")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "", tags={ "fake",  })
+    @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
     public void testBodyWithFileSchema(@Valid FileSchemaTestClass body);
@@ -100,7 +100,7 @@ public interface FakeApi  {
     @PUT
     @Path("/body-with-query-params")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "", tags={ "fake",  })
+    @ApiOperation(value = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success") })
     public void testBodyWithQueryParams(@QueryParam("query") @NotNull  String query, @Valid User body);
@@ -115,7 +115,7 @@ public interface FakeApi  {
     
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
-    @ApiOperation(value = "To test \"client\" model", tags={ "fake",  })
+    @ApiOperation(value = "To test \"client\" model", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     public Client testClientModel(@Valid Client body);
@@ -129,7 +129,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    @ApiOperation(value = "Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트", tags={ "fake",  })
+    @ApiOperation(value = "Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
@@ -144,7 +144,7 @@ public interface FakeApi  {
     @GET
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    @ApiOperation(value = "To test enum parameters", tags={ "fake",  })
+    @ApiOperation(value = "To test enum parameters", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request"),
         @ApiResponse(code = 404, message = "Not found") })
@@ -158,7 +158,7 @@ public interface FakeApi  {
      */
     @DELETE
     
-    @ApiOperation(value = "Fake endpoint to test group parameters (optional)", tags={ "fake",  })
+    @ApiOperation(value = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Someting wrong") })
     public void testGroupParameters(@QueryParam("required_string_group") @NotNull  Integer requiredStringGroup, @HeaderParam("required_boolean_group")  @NotNull  Boolean requiredBooleanGroup, @QueryParam("required_int64_group") @NotNull  Long requiredInt64Group, @QueryParam("string_group")  Integer stringGroup, @HeaderParam("boolean_group")   Boolean booleanGroup, @QueryParam("int64_group")  Long int64Group);
@@ -170,7 +170,7 @@ public interface FakeApi  {
     @POST
     @Path("/inline-additionalProperties")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "test inline additionalProperties", tags={ "fake",  })
+    @ApiOperation(value = "test inline additionalProperties", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     public void testInlineAdditionalProperties(@Valid Map<String, String> param);
@@ -182,7 +182,7 @@ public interface FakeApi  {
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @ApiOperation(value = "test json serialization of form data", tags={ "fake",  })
+    @ApiOperation(value = "test json serialization of form data", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     public void testJsonFormData(@Multipart(value = "param")  String param, @Multipart(value = "param2")  String param2);
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/PetApi.java
index 8a6246e339f..a78ab96f161 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/PetApi.java
@@ -42,7 +42,7 @@ public interface PetApi  {
     @POST
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @ApiOperation(value = "Add a new pet to the store", tags={ "pet",  })
+    @ApiOperation(value = "Add a new pet to the store", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 405, message = "Invalid input") })
@@ -54,7 +54,7 @@ public interface PetApi  {
      */
     @DELETE
     @Path("/pet/{petId}")
-    @ApiOperation(value = "Deletes a pet", tags={ "pet",  })
+    @ApiOperation(value = "Deletes a pet", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid pet value") })
@@ -69,7 +69,7 @@ public interface PetApi  {
     @GET
     @Path("/pet/findByStatus")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Finds Pets by status", tags={ "pet",  })
+    @ApiOperation(value = "Finds Pets by status", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value") })
@@ -84,7 +84,7 @@ public interface PetApi  {
     @GET
     @Path("/pet/findByTags")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Finds Pets by tags", tags={ "pet",  })
+    @ApiOperation(value = "Finds Pets by tags", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value") })
@@ -99,7 +99,7 @@ public interface PetApi  {
     @GET
     @Path("/pet/{petId}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Find pet by ID", tags={ "pet",  })
+    @ApiOperation(value = "Find pet by ID", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
@@ -113,7 +113,7 @@ public interface PetApi  {
     @PUT
     @Path("/pet")
     @Consumes({ "application/json", "application/xml" })
-    @ApiOperation(value = "Update an existing pet", tags={ "pet",  })
+    @ApiOperation(value = "Update an existing pet", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation"),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
@@ -128,7 +128,7 @@ public interface PetApi  {
     @POST
     @Path("/pet/{petId}")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @ApiOperation(value = "Updates a pet in the store with form data", tags={ "pet",  })
+    @ApiOperation(value = "Updates a pet in the store with form data", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input") })
     public void updatePetWithForm(@PathParam("petId") Long petId, @Multipart(value = "name", required = false)  String name, @Multipart(value = "status", required = false)  String status);
@@ -141,7 +141,7 @@ public interface PetApi  {
     @Path("/pet/{petId}/uploadImage")
     @Consumes({ "multipart/form-data" })
     @Produces({ "application/json" })
-    @ApiOperation(value = "uploads an image", tags={ "pet",  })
+    @ApiOperation(value = "uploads an image", tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
     public ModelApiResponse uploadFile(@PathParam("petId") Long petId, @Multipart(value = "additionalMetadata", required = false)  String additionalMetadata,  @Multipart(value = "file" , required = false) Attachment fileDetail);
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java
index f440481f152..ac0a02f63fc 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/StoreApi.java
@@ -39,7 +39,7 @@ public interface StoreApi  {
      */
     @DELETE
     @Path("/order/{order_id}")
-    @ApiOperation(value = "Delete purchase order by ID", tags={ "store",  })
+    @ApiOperation(value = "Delete purchase order by ID", tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
         @ApiResponse(code = 404, message = "Order not found") })
@@ -54,7 +54,7 @@ public interface StoreApi  {
     @GET
     @Path("/inventory")
     @Produces({ "application/json" })
-    @ApiOperation(value = "Returns pet inventories by status", tags={ "store",  })
+    @ApiOperation(value = "Returns pet inventories by status", tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
     public Map<String, Integer> getInventory();
@@ -68,7 +68,7 @@ public interface StoreApi  {
     @GET
     @Path("/order/{order_id}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Find purchase order by ID", tags={ "store",  })
+    @ApiOperation(value = "Find purchase order by ID", tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied"),
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/UserApi.java
index edff4962812..a90c5ac242a 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/api/UserApi.java
@@ -40,7 +40,7 @@ public interface UserApi  {
     @POST
     
     @Consumes({ "application/json" })
-    @ApiOperation(value = "Create user", tags={ "user",  })
+    @ApiOperation(value = "Create user", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     public void createUser(@Valid User body);
@@ -52,7 +52,7 @@ public interface UserApi  {
     @POST
     @Path("/createWithArray")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
+    @ApiOperation(value = "Creates list of users with given input array", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     public void createUsersWithArrayInput(@Valid List<User> body);
@@ -64,7 +64,7 @@ public interface UserApi  {
     @POST
     @Path("/createWithList")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "Creates list of users with given input array", tags={ "user",  })
+    @ApiOperation(value = "Creates list of users with given input array", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     public void createUsersWithListInput(@Valid List<User> body);
@@ -77,7 +77,7 @@ public interface UserApi  {
      */
     @DELETE
     @Path("/{username}")
-    @ApiOperation(value = "Delete user", tags={ "user",  })
+    @ApiOperation(value = "Delete user", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
@@ -90,7 +90,7 @@ public interface UserApi  {
     @GET
     @Path("/{username}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Get user by user name", tags={ "user",  })
+    @ApiOperation(value = "Get user by user name", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied"),
@@ -104,7 +104,7 @@ public interface UserApi  {
     @GET
     @Path("/login")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Logs user into the system", tags={ "user",  })
+    @ApiOperation(value = "Logs user into the system", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied") })
@@ -116,7 +116,7 @@ public interface UserApi  {
      */
     @GET
     @Path("/logout")
-    @ApiOperation(value = "Logs out current logged in user session", tags={ "user",  })
+    @ApiOperation(value = "Logs out current logged in user session", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation") })
     public void logoutUser();
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Animal.java
index 196b973164a..aff505263a5 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Animal.java
@@ -18,9 +18,9 @@ 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"),
-  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
 })
 
 public class Animal  {
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCat.java
index ea440f03445..11d450e49d6 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCat.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.BigCatAllOf;
 import org.openapitools.model.Cat;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCatAllOf.java
index 3ca25178105..c9d95b07dd4 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumArrays.java
index ae16f4a7bf6..0671e7b13f8 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.*;
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumTest.java
index acd2762872f..cee18f27aab 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/EnumTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.model.OuterEnum;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FormatTest.java
index 9e915d8f54c..560ef7288ef 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/FormatTest.java
@@ -65,6 +65,7 @@ public class FormatTest  {
   private String password;
 
   @ApiModelProperty(value = "")
+  @Valid
   private BigDecimal bigDecimal;
  /**
   * Get integer
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java
index c9495d9f7d4..e5af440e022 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/MapTest.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Order.java
index c17b378f5b9..baf2e5252bd 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Order.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Date;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
diff --git a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Pet.java
index e23e730eeff..289c50b9f4a 100644
--- a/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf-test-data/src/gen/java/org/openapitools/model/Pet.java
@@ -1,5 +1,7 @@
 package org.openapitools.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
index d99e7162d01..6555596f931 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
+++ b/samples/server/petstore/jaxrs-spec-interface-response/.openapi-generator/VERSION
@@ -1 +1 @@
-5.0.0-SNAPSHOT
\ No newline at end of file
+5.2.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/pom.xml b/samples/server/petstore/jaxrs-spec-interface-response/pom.xml
index 355d55d58d6..fdf423d8275 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/pom.xml
+++ b/samples/server/petstore/jaxrs-spec-interface-response/pom.xml
@@ -79,6 +79,6 @@
   </dependencies>
   <properties>
     <jackson-version>2.9.9</jackson-version>
-    <junit-version>4.8.1</junit-version>
+    <junit-version>4.13.1</junit-version>
   </properties>
 </project>
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java
index 396dbd24cfe..0d7fa5cb4d0 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/AnotherFakeApi.java
@@ -23,5 +23,5 @@ import javax.validation.Valid;
     @ApiOperation(value = "To test special tags", notes = "To test special tags and operation ID starting with number", tags={ "$another-fake?" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    Response call123testSpecialTags(@Valid Client body);
+    Response call123testSpecialTags(@Valid @NotNull Client body);
 }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
index 3b7b4a9af83..e7cd7f519d1 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
@@ -30,15 +30,15 @@ import javax.validation.Valid;
     @POST
     @Path("/create_xml_item")
     @Consumes({ "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" })
-    @ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", tags={ "fake",  })
+    @ApiOperation(value = "creates an XmlItem", notes = "this route creates an XmlItem", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    Response createXmlItem(@Valid XmlItem xmlItem);
+    Response createXmlItem(@Valid @NotNull XmlItem xmlItem);
 
     @POST
     @Path("/outer/boolean")
     @Produces({ "*/*" })
-    @ApiOperation(value = "", notes = "Test serialization of outer boolean types", tags={ "fake",  })
+    @ApiOperation(value = "", notes = "Test serialization of outer boolean types", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output boolean", response = Boolean.class) })
     Response fakeOuterBooleanSerialize(@Valid Boolean body);
@@ -46,7 +46,7 @@ import javax.validation.Valid;
     @POST
     @Path("/outer/composite")
     @Produces({ "*/*" })
-    @ApiOperation(value = "", notes = "Test serialization of object with outer number type", tags={ "fake",  })
+    @ApiOperation(value = "", notes = "Test serialization of object with outer number type", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output composite", response = OuterComposite.class) })
     Response fakeOuterCompositeSerialize(@Valid OuterComposite body);
@@ -54,7 +54,7 @@ import javax.validation.Valid;
     @POST
     @Path("/outer/number")
     @Produces({ "*/*" })
-    @ApiOperation(value = "", notes = "Test serialization of outer number types", tags={ "fake",  })
+    @ApiOperation(value = "", notes = "Test serialization of outer number types", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output number", response = BigDecimal.class) })
     Response fakeOuterNumberSerialize(@Valid BigDecimal body);
@@ -62,7 +62,7 @@ import javax.validation.Valid;
     @POST
     @Path("/outer/string")
     @Produces({ "*/*" })
-    @ApiOperation(value = "", notes = "Test serialization of outer string types", tags={ "fake",  })
+    @ApiOperation(value = "", notes = "Test serialization of outer string types", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Output string", response = String.class) })
     Response fakeOuterStringSerialize(@Valid String body);
@@ -70,32 +70,33 @@ import javax.validation.Valid;
     @PUT
     @Path("/body-with-file-schema")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake",  })
+    @ApiOperation(value = "", notes = "For this test, the body for this request much reference a schema named `File`.", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success", response = Void.class) })
-    Response testBodyWithFileSchema(@Valid FileSchemaTestClass body);
+    Response testBodyWithFileSchema(@Valid @NotNull FileSchemaTestClass body);
 
     @PUT
     @Path("/body-with-query-params")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "", notes = "", tags={ "fake",  })
+    @ApiOperation(value = "", notes = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success", response = Void.class) })
-    Response testBodyWithQueryParams(@QueryParam("query") @NotNull    String query,@Valid User body);
+    Response testBodyWithQueryParams(@QueryParam("query") @NotNull    String query,@Valid @NotNull User body);
 
     @PATCH
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
-    @ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", tags={ "fake",  })
+    @ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    Response testClientModel(@Valid Client body);
+    Response testClientModel(@Valid @NotNull Client body);
 
     @POST
     @Consumes({ "application/x-www-form-urlencoded" })
     @ApiOperation(value = "Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트", notes = "Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트", authorizations = {
+        
         @Authorization(value = "http_basic_test")
-    }, tags={ "fake",  })
+         }, tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
@@ -103,14 +104,14 @@ import javax.validation.Valid;
 
     @GET
     @Consumes({ "application/x-www-form-urlencoded" })
-    @ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", tags={ "fake",  })
+    @ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request", response = Void.class),
         @ApiResponse(code = 404, message = "Not found", response = Void.class) })
-    Response testEnumParameters(@HeaderParam("enum_header_string_array")   @DefaultValue("new ArrayList<String>()")  @ApiParam("Header parameter enum test (string array)") List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")   @DefaultValue("-efg")  @ApiParam("Header parameter enum test (string)") String enumHeaderString,@QueryParam("enum_query_string_array")   @ApiParam("Query parameter enum test (string array)")  List<String> enumQueryStringArray,@QueryParam("enum_query_string")  @DefaultValue("-efg")  @ApiParam("Query parameter enum test (string)")  String enumQueryString,@QueryParam("enum_query_integer")   @ApiParam("Query parameter enum test (double)")  Integer enumQueryInteger,@QueryParam("enum_query_double")   @ApiParam("Query parameter enum test (double)")  Double enumQueryDouble,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString);
+    Response testEnumParameters(@HeaderParam("enum_header_string_array")    @ApiParam("Header parameter enum test (string array)") List<String> enumHeaderStringArray,@HeaderParam("enum_header_string")   @DefaultValue("-efg")  @ApiParam("Header parameter enum test (string)") String enumHeaderString,@QueryParam("enum_query_string_array")   @ApiParam("Query parameter enum test (string array)")  List<String> enumQueryStringArray,@QueryParam("enum_query_string")  @DefaultValue("-efg")  @ApiParam("Query parameter enum test (string)")  String enumQueryString,@QueryParam("enum_query_integer")   @ApiParam("Query parameter enum test (double)")  Integer enumQueryInteger,@QueryParam("enum_query_double")   @ApiParam("Query parameter enum test (double)")  Double enumQueryDouble,@FormParam(value = "enum_form_string_array")  List<String> enumFormStringArray,@FormParam(value = "enum_form_string")  String enumFormString);
 
     @DELETE
-    @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake",  })
+    @ApiOperation(value = "Fake endpoint to test group parameters (optional)", notes = "Fake endpoint to test group parameters (optional)", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Someting wrong", response = Void.class) })
     Response testGroupParameters(@QueryParam("required_string_group") @NotNull   @ApiParam("Required String in group parameters")  Integer requiredStringGroup,@HeaderParam("required_boolean_group") @NotNull    @ApiParam("Required Boolean in group parameters") Boolean requiredBooleanGroup,@QueryParam("required_int64_group") @NotNull   @ApiParam("Required Integer in group parameters")  Long requiredInt64Group,@QueryParam("string_group")   @ApiParam("String in group parameters")  Integer stringGroup,@HeaderParam("boolean_group")    @ApiParam("Boolean in group parameters") Boolean booleanGroup,@QueryParam("int64_group")   @ApiParam("Integer in group parameters")  Long int64Group);
@@ -118,22 +119,22 @@ import javax.validation.Valid;
     @POST
     @Path("/inline-additionalProperties")
     @Consumes({ "application/json" })
-    @ApiOperation(value = "test inline additionalProperties", notes = "", tags={ "fake",  })
+    @ApiOperation(value = "test inline additionalProperties", notes = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    Response testInlineAdditionalProperties(@Valid Map<String, String> param);
+    Response testInlineAdditionalProperties(@Valid @NotNull Map<String, String> param);
 
     @GET
     @Path("/jsonFormData")
     @Consumes({ "application/x-www-form-urlencoded" })
-    @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake",  })
+    @ApiOperation(value = "test json serialization of form data", notes = "", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
     Response testJsonFormData(@FormParam(value = "param")  String param,@FormParam(value = "param2")  String param2);
 
     @PUT
     @Path("/test-query-paramters")
-    @ApiOperation(value = "", notes = "To test the collection format in query parameters", tags={ "fake",  })
+    @ApiOperation(value = "", notes = "To test the collection format in query parameters", tags={ "fake" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "Success", response = Void.class) })
     Response testQueryParameterCollectionFormat(@QueryParam("pipe") @NotNull    List<String> pipe,@QueryParam("ioutil") @NotNull    List<String> ioutil,@QueryParam("http") @NotNull    List<String> http,@QueryParam("url") @NotNull    List<String> url,@QueryParam("context") @NotNull    List<String> context);
@@ -145,9 +146,8 @@ import javax.validation.Valid;
     @ApiOperation(value = "uploads an image (required)", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet" })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
     Response uploadFileWithRequiredFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId, @FormParam(value = "requiredFile") InputStream requiredFileInputStream,@FormParam(value = "additionalMetadata")  String additionalMetadata);
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
index 58c51e67a78..5d1c770b70a 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java
@@ -21,9 +21,10 @@ import javax.validation.Valid;
     @Consumes({ "application/json" })
     @Produces({ "application/json" })
     @ApiOperation(value = "To test class name in snake case", notes = "To test class name in snake case", authorizations = {
+        
         @Authorization(value = "api_key_query")
-    }, tags={ "fake_classname_tags 123#$%^" })
+         }, tags={ "fake_classname_tags 123#$%^" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
-    Response testClassname(@Valid Client body);
+    Response testClassname(@Valid @NotNull Client body);
 }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java
index 2154b8d1e8a..480057d9367 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/PetApi.java
@@ -25,22 +25,20 @@ import javax.validation.Valid;
     @ApiOperation(value = "Add a new pet to the store", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class),
         @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
-    Response addPet(@Valid Pet body);
+    Response addPet(@Valid @NotNull Pet body);
 
     @DELETE
     @Path("/{petId}")
     @ApiOperation(value = "Deletes a pet", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class),
         @ApiResponse(code = 400, message = "Invalid pet value", response = Void.class) })
@@ -52,9 +50,8 @@ import javax.validation.Valid;
     @ApiOperation(value = "Finds Pets by status", notes = "Multiple status values can be provided with comma separated strings", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
         @ApiResponse(code = 400, message = "Invalid status value", response = Void.class, responseContainer = "List") })
@@ -66,9 +63,8 @@ import javax.validation.Valid;
     @ApiOperation(value = "Finds Pets by tags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "Set"),
         @ApiResponse(code = 400, message = "Invalid tag value", response = Void.class, responseContainer = "Set") })
@@ -78,8 +74,9 @@ import javax.validation.Valid;
     @Path("/{petId}")
     @Produces({ "application/xml", "application/json" })
     @ApiOperation(value = "Find pet by ID", notes = "Returns a single pet", authorizations = {
+        
         @Authorization(value = "api_key")
-    }, tags={ "pet",  })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -91,15 +88,14 @@ import javax.validation.Valid;
     @ApiOperation(value = "Update an existing pet", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
         @ApiResponse(code = 404, message = "Pet not found", response = Void.class),
         @ApiResponse(code = 405, message = "Validation exception", response = Void.class) })
-    Response updatePet(@Valid Pet body);
+    Response updatePet(@Valid @NotNull Pet body);
 
     @POST
     @Path("/{petId}")
@@ -107,9 +103,8 @@ import javax.validation.Valid;
     @ApiOperation(value = "Updates a pet in the store with form data", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet",  })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 405, message = "Invalid input", response = Void.class) })
     Response updatePetWithForm(@PathParam("petId") @ApiParam("ID of pet that needs to be updated") Long petId,@FormParam(value = "name")  String name,@FormParam(value = "status")  String status);
@@ -121,9 +116,8 @@ import javax.validation.Valid;
     @ApiOperation(value = "uploads an image", notes = "", authorizations = {
         @Authorization(value = "petstore_auth", scopes = {
             @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets")
-        })
-    }, tags={ "pet" })
+            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
+         }, tags={ "pet" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
     Response uploadFile(@PathParam("petId") @ApiParam("ID of pet to update") Long petId,@FormParam(value = "additionalMetadata")  String additionalMetadata, @FormParam(value = "file") InputStream fileInputStream);
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
index 01593fedfec..06a7a2967ed 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/StoreApi.java
@@ -20,7 +20,7 @@ import javax.validation.Valid;
 
     @DELETE
     @Path("/order/{order_id}")
-    @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ "store",  })
+    @ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
         @ApiResponse(code = 404, message = "Order not found", response = Void.class) })
@@ -30,8 +30,9 @@ import javax.validation.Valid;
     @Path("/inventory")
     @Produces({ "application/json" })
     @ApiOperation(value = "Returns pet inventories by status", notes = "Returns a map of status codes to quantities", authorizations = {
+        
         @Authorization(value = "api_key")
-    }, tags={ "store",  })
+         }, tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
     Response getInventory();
@@ -39,7 +40,7 @@ import javax.validation.Valid;
     @GET
     @Path("/order/{order_id}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", tags={ "store",  })
+    @ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", tags={ "store" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid ID supplied", response = Void.class),
@@ -53,5 +54,5 @@ import javax.validation.Valid;
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Order.class),
         @ApiResponse(code = 400, message = "Invalid Order", response = Void.class) })
-    Response placeOrder(@Valid Order body);
+    Response placeOrder(@Valid @NotNull Order body);
 }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java
index 7d821837153..77ea16dbeb8 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/UserApi.java
@@ -19,28 +19,28 @@ import javax.validation.Valid;
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public interface UserApi {
 
     @POST
-    @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user",  })
+    @ApiOperation(value = "Create user", notes = "This can only be done by the logged in user.", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    Response createUser(@Valid User body);
+    Response createUser(@Valid @NotNull User body);
 
     @POST
     @Path("/createWithArray")
-    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user",  })
+    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    Response createUsersWithArrayInput(@Valid List<User> body);
+    Response createUsersWithArrayInput(@Valid @NotNull List<User> body);
 
     @POST
     @Path("/createWithList")
-    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user",  })
+    @ApiOperation(value = "Creates list of users with given input array", notes = "", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
-    Response createUsersWithListInput(@Valid List<User> body);
+    Response createUsersWithListInput(@Valid @NotNull List<User> body);
 
     @DELETE
     @Path("/{username}")
-    @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", tags={ "user",  })
+    @ApiOperation(value = "Delete user", notes = "This can only be done by the logged in user.", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
@@ -49,7 +49,7 @@ import javax.validation.Valid;
     @GET
     @Path("/{username}")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Get user by user name", notes = "", tags={ "user",  })
+    @ApiOperation(value = "Get user by user name", notes = "", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = User.class),
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
@@ -59,7 +59,7 @@ import javax.validation.Valid;
     @GET
     @Path("/login")
     @Produces({ "application/xml", "application/json" })
-    @ApiOperation(value = "Logs user into the system", notes = "", tags={ "user",  })
+    @ApiOperation(value = "Logs user into the system", notes = "", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = String.class),
         @ApiResponse(code = 400, message = "Invalid username/password supplied", response = Void.class) })
@@ -67,7 +67,7 @@ import javax.validation.Valid;
 
     @GET
     @Path("/logout")
-    @ApiOperation(value = "Logs out current logged in user session", notes = "", tags={ "user",  })
+    @ApiOperation(value = "Logs out current logged in user session", notes = "", tags={ "user" })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Void.class) })
     Response logoutUser();
@@ -78,5 +78,5 @@ import javax.validation.Valid;
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid user supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    Response updateUser(@PathParam("username") @ApiParam("name that need to be deleted") String username,@Valid User body);
+    Response updateUser(@PathParam("username") @ApiParam("name that need to be deleted") String username,@Valid @NotNull User body);
 }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index f2521988441..6b9dcfa1ac6 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
index 7cc3e609972..1b504c15f4e 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 172c5f42dad..d842728a186 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
index b646cfb0b0d..ab1baad9976 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -50,7 +50,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapString(Map<String, String> mapString) {
     this.mapString = mapString;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
     this.mapNumber = mapNumber;
@@ -68,7 +70,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapNumber(Map<String, BigDecimal> mapNumber) {
     this.mapNumber = mapNumber;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
     this.mapInteger = mapInteger;
@@ -86,7 +90,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapInteger(Map<String, Integer> mapInteger) {
     this.mapInteger = mapInteger;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
     this.mapBoolean = mapBoolean;
@@ -104,7 +110,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapBoolean(Map<String, Boolean> mapBoolean) {
     this.mapBoolean = mapBoolean;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
     this.mapArrayInteger = mapArrayInteger;
@@ -122,7 +130,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
     this.mapArrayInteger = mapArrayInteger;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
     this.mapArrayAnytype = mapArrayAnytype;
@@ -140,7 +150,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
     this.mapArrayAnytype = mapArrayAnytype;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
     this.mapMapString = mapMapString;
@@ -158,7 +170,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
     this.mapMapString = mapMapString;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
     this.mapMapAnytype = mapMapAnytype;
@@ -176,7 +190,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
     this.mapMapAnytype = mapMapAnytype;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass anytype1(Object anytype1) {
     this.anytype1 = anytype1;
@@ -194,7 +210,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setAnytype1(Object anytype1) {
     this.anytype1 = anytype1;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass anytype2(Object anytype2) {
     this.anytype2 = anytype2;
@@ -212,7 +230,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setAnytype2(Object anytype2) {
     this.anytype2 = anytype2;
-  }/**
+  }
+
+/**
    **/
   public AdditionalPropertiesClass anytype3(Object anytype3) {
     this.anytype3 = anytype3;
@@ -232,6 +252,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.anytype3 = anytype3;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 2c2e51fb83b..6f925720aba 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 4735b0fd5bd..884577dcdd0 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
index 05f7408f9a8..cbe4428f3e3 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
index 03739679cd0..16f6a60afd1 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
index 3b0eff6127c..8ddd9ed2f8c 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Animal.java
@@ -16,9 +16,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 @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"),
   @JsonSubTypes.Type(value = BigCat.class, name = "BigCat"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
 })
 
 
@@ -46,7 +46,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setClassName(String className) {
     this.className = className;
-  }/**
+  }
+
+/**
    **/
   public Animal color(String color) {
     this.color = color;
@@ -66,6 +68,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.color = color;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 77a46a2186a..9643930053c 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.arrayArrayNumber = arrayArrayNumber;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
index 36039422cf3..2c585cdc1e8 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -41,6 +41,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.arrayNumber = arrayNumber;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
index 374527d8ad5..edc0b7a9484 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ArrayTest.java
@@ -41,7 +41,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setArrayOfString(List<String> arrayOfString) {
     this.arrayOfString = arrayOfString;
-  }/**
+  }
+
+/**
    **/
   public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
@@ -59,7 +61,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
     this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }/**
+  }
+
+/**
    **/
   public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayArrayOfModel = arrayArrayOfModel;
@@ -79,6 +83,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.arrayArrayOfModel = arrayArrayOfModel;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java
index 33dff05e836..1a3ddba789b 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCat.java
@@ -73,6 +73,7 @@ public enum KindEnum {
     this.kind = kind;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java
index 0b5a153a074..080e86afaca 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/BigCatAllOf.java
@@ -71,6 +71,7 @@ public enum KindEnum {
     this.kind = kind;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
index 27f378125da..a65c79d984e 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Capitalization.java
@@ -41,7 +41,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setSmallCamel(String smallCamel) {
     this.smallCamel = smallCamel;
-  }/**
+  }
+
+/**
    **/
   public Capitalization capitalCamel(String capitalCamel) {
     this.capitalCamel = capitalCamel;
@@ -59,7 +61,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setCapitalCamel(String capitalCamel) {
     this.capitalCamel = capitalCamel;
-  }/**
+  }
+
+/**
    **/
   public Capitalization smallSnake(String smallSnake) {
     this.smallSnake = smallSnake;
@@ -77,7 +81,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setSmallSnake(String smallSnake) {
     this.smallSnake = smallSnake;
-  }/**
+  }
+
+/**
    **/
   public Capitalization capitalSnake(String capitalSnake) {
     this.capitalSnake = capitalSnake;
@@ -95,7 +101,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setCapitalSnake(String capitalSnake) {
     this.capitalSnake = capitalSnake;
-  }/**
+  }
+
+/**
    **/
   public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
@@ -113,7 +121,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setScAETHFlowPoints(String scAETHFlowPoints) {
     this.scAETHFlowPoints = scAETHFlowPoints;
-  }/**
+  }
+
+/**
    * Name of the pet 
    **/
   public Capitalization ATT_NAME(String ATT_NAME) {
@@ -134,6 +144,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.ATT_NAME = ATT_NAME;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
index b0a2eacada2..4cc078e2235 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Cat.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.declawed = declawed;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java
index f405b41e872..e56df72d3be 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/CatAllOf.java
@@ -38,6 +38,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.declawed = declawed;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
index 32076613c9d..9af6f93c7c4 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Category.java
@@ -37,7 +37,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setId(Long id) {
     this.id = id;
-  }/**
+  }
+
+/**
    **/
   public Category name(String name) {
     this.name = name;
@@ -58,6 +60,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
index e3153a9f03e..f050e12bb25 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ClassModel.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.propertyClass = propertyClass;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
index 81a1033e052..4cdbbef940d 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Client.java
@@ -38,6 +38,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.client = client;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
index 01e256a23d0..87c3a825ba8 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Dog.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.breed = breed;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java
index 3291b8f7c78..5496e3c8915 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/DogAllOf.java
@@ -38,6 +38,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.breed = breed;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
index c7ceed68c70..fc7770afa09 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumArrays.java
@@ -105,7 +105,9 @@ public enum ArrayEnumEnum {
 
   public void setJustSymbol(JustSymbolEnum justSymbol) {
     this.justSymbol = justSymbol;
-  }/**
+  }
+
+/**
    **/
   public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
     this.arrayEnum = arrayEnum;
@@ -125,6 +127,7 @@ public enum ArrayEnumEnum {
     this.arrayEnum = arrayEnum;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
index d74cb2ff037..6c02f0647c9 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/EnumTest.java
@@ -173,7 +173,9 @@ public enum EnumNumberEnum {
 
   public void setEnumString(EnumStringEnum enumString) {
     this.enumString = enumString;
-  }/**
+  }
+
+/**
    **/
   public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     this.enumStringRequired = enumStringRequired;
@@ -192,7 +194,9 @@ public enum EnumNumberEnum {
 
   public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     this.enumStringRequired = enumStringRequired;
-  }/**
+  }
+
+/**
    **/
   public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
@@ -210,7 +214,9 @@ public enum EnumNumberEnum {
 
   public void setEnumInteger(EnumIntegerEnum enumInteger) {
     this.enumInteger = enumInteger;
-  }/**
+  }
+
+/**
    **/
   public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
@@ -228,7 +234,9 @@ public enum EnumNumberEnum {
 
   public void setEnumNumber(EnumNumberEnum enumNumber) {
     this.enumNumber = enumNumber;
-  }/**
+  }
+
+/**
    **/
   public EnumTest outerEnum(OuterEnum outerEnum) {
     this.outerEnum = outerEnum;
@@ -248,6 +256,7 @@ public enum EnumNumberEnum {
     this.outerEnum = outerEnum;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
index 8aa815da794..b8ba37d5cdc 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setFile(java.io.File file) {
     this.file = file;
-  }/**
+  }
+
+/**
    **/
   public FileSchemaTestClass files(List<java.io.File> files) {
     this.files = files;
@@ -59,6 +61,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.files = files;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
index 70a7eed2fdd..ca11645f9ae 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
@@ -56,7 +56,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setInteger(Integer integer) {
     this.integer = integer;
-  }/**
+  }
+
+/**
    * minimum: 20
    * maximum: 200
    **/
@@ -76,7 +78,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setInt32(Integer int32) {
     this.int32 = int32;
-  }/**
+  }
+
+/**
    **/
   public FormatTest int64(Long int64) {
     this.int64 = int64;
@@ -94,7 +98,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setInt64(Long int64) {
     this.int64 = int64;
-  }/**
+  }
+
+/**
    * minimum: 32.1
    * maximum: 543.2
    **/
@@ -115,7 +121,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNumber(BigDecimal number) {
     this.number = number;
-  }/**
+  }
+
+/**
    * minimum: 54.3
    * maximum: 987.6
    **/
@@ -135,7 +143,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setFloat(Float _float) {
     this._float = _float;
-  }/**
+  }
+
+/**
    * minimum: 67.8
    * maximum: 123.4
    **/
@@ -155,7 +165,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setDouble(Double _double) {
     this._double = _double;
-  }/**
+  }
+
+/**
    **/
   public FormatTest string(String string) {
     this.string = string;
@@ -173,7 +185,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setString(String string) {
     this.string = string;
-  }/**
+  }
+
+/**
    **/
   public FormatTest _byte(byte[] _byte) {
     this._byte = _byte;
@@ -192,7 +206,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setByte(byte[] _byte) {
     this._byte = _byte;
-  }/**
+  }
+
+/**
    **/
   public FormatTest binary(File binary) {
     this.binary = binary;
@@ -210,7 +226,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setBinary(File binary) {
     this.binary = binary;
-  }/**
+  }
+
+/**
    **/
   public FormatTest date(LocalDate date) {
     this.date = date;
@@ -229,7 +247,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setDate(LocalDate date) {
     this.date = date;
-  }/**
+  }
+
+/**
    **/
   public FormatTest dateTime(Date dateTime) {
     this.dateTime = dateTime;
@@ -247,7 +267,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setDateTime(Date dateTime) {
     this.dateTime = dateTime;
-  }/**
+  }
+
+/**
    **/
   public FormatTest uuid(UUID uuid) {
     this.uuid = uuid;
@@ -265,7 +287,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setUuid(UUID uuid) {
     this.uuid = uuid;
-  }/**
+  }
+
+/**
    **/
   public FormatTest password(String password) {
     this.password = password;
@@ -284,7 +308,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPassword(String password) {
     this.password = password;
-  }/**
+  }
+
+/**
    **/
   public FormatTest bigDecimal(BigDecimal bigDecimal) {
     this.bigDecimal = bigDecimal;
@@ -304,6 +330,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.bigDecimal = bigDecimal;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
index cebb1bb512b..6438846d569 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -37,7 +37,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setBar(String bar) {
     this.bar = bar;
-  }/**
+  }
+
+/**
    **/
   public HasOnlyReadOnly foo(String foo) {
     this.foo = foo;
@@ -57,6 +59,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.foo = foo;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
index be225de067d..a8eff4c21b2 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MapTest.java
@@ -75,7 +75,9 @@ public enum InnerEnum {
 
   public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
-  }/**
+  }
+
+/**
    **/
   public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
     this.mapOfEnumString = mapOfEnumString;
@@ -93,7 +95,9 @@ public enum InnerEnum {
 
   public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
     this.mapOfEnumString = mapOfEnumString;
-  }/**
+  }
+
+/**
    **/
   public MapTest directMap(Map<String, Boolean> directMap) {
     this.directMap = directMap;
@@ -111,7 +115,9 @@ public enum InnerEnum {
 
   public void setDirectMap(Map<String, Boolean> directMap) {
     this.directMap = directMap;
-  }/**
+  }
+
+/**
    **/
   public MapTest indirectMap(Map<String, Boolean> indirectMap) {
     this.indirectMap = indirectMap;
@@ -131,6 +137,7 @@ public enum InnerEnum {
     this.indirectMap = indirectMap;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 136a4fab119..aace3762eb9 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setUuid(UUID uuid) {
     this.uuid = uuid;
-  }/**
+  }
+
+/**
    **/
   public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
     this.dateTime = dateTime;
@@ -62,7 +64,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setDateTime(Date dateTime) {
     this.dateTime = dateTime;
-  }/**
+  }
+
+/**
    **/
   public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
     this.map = map;
@@ -82,6 +86,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.map = map;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
index 3a8a04baa8f..d96df1aceae 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Model200Response.java
@@ -39,7 +39,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setName(Integer name) {
     this.name = name;
-  }/**
+  }
+
+/**
    **/
   public Model200Response propertyClass(String propertyClass) {
     this.propertyClass = propertyClass;
@@ -59,6 +61,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.propertyClass = propertyClass;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
index f382361e58c..952439560b5 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setCode(Integer code) {
     this.code = code;
-  }/**
+  }
+
+/**
    **/
   public ModelApiResponse type(String type) {
     this.type = type;
@@ -56,7 +58,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setType(String type) {
     this.type = type;
-  }/**
+  }
+
+/**
    **/
   public ModelApiResponse message(String message) {
     this.message = message;
@@ -76,6 +80,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.message = message;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
index 30180e1f251..6d6cb5b806f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ModelReturn.java
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this._return = _return;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
index 199e9772bf0..6fd504dbe9d 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Name.java
@@ -42,7 +42,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setName(Integer name) {
     this.name = name;
-  }/**
+  }
+
+/**
    **/
   public Name snakeCase(Integer snakeCase) {
     this.snakeCase = snakeCase;
@@ -60,7 +62,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setSnakeCase(Integer snakeCase) {
     this.snakeCase = snakeCase;
-  }/**
+  }
+
+/**
    **/
   public Name property(String property) {
     this.property = property;
@@ -78,7 +82,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setProperty(String property) {
     this.property = property;
-  }/**
+  }
+
+/**
    **/
   public Name _123number(Integer _123number) {
     this._123number = _123number;
@@ -98,6 +104,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this._123number = _123number;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
index 6e62b0792c7..07a70cd9da5 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/NumberOnly.java
@@ -39,6 +39,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.justNumber = justNumber;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
index 6a877eda5db..9929a0d5043 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Order.java
@@ -75,7 +75,9 @@ public enum StatusEnum {
 
   public void setId(Long id) {
     this.id = id;
-  }/**
+  }
+
+/**
    **/
   public Order petId(Long petId) {
     this.petId = petId;
@@ -93,7 +95,9 @@ public enum StatusEnum {
 
   public void setPetId(Long petId) {
     this.petId = petId;
-  }/**
+  }
+
+/**
    **/
   public Order quantity(Integer quantity) {
     this.quantity = quantity;
@@ -111,7 +115,9 @@ public enum StatusEnum {
 
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
-  }/**
+  }
+
+/**
    **/
   public Order shipDate(Date shipDate) {
     this.shipDate = shipDate;
@@ -129,7 +135,9 @@ public enum StatusEnum {
 
   public void setShipDate(Date shipDate) {
     this.shipDate = shipDate;
-  }/**
+  }
+
+/**
    * Order Status
    **/
   public Order status(StatusEnum status) {
@@ -148,7 +156,9 @@ public enum StatusEnum {
 
   public void setStatus(StatusEnum status) {
     this.status = status;
-  }/**
+  }
+
+/**
    **/
   public Order complete(Boolean complete) {
     this.complete = complete;
@@ -168,6 +178,7 @@ public enum StatusEnum {
     this.complete = complete;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
index 118a92239cb..6e34a0e0a80 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/OuterComposite.java
@@ -39,7 +39,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMyNumber(BigDecimal myNumber) {
     this.myNumber = myNumber;
-  }/**
+  }
+
+/**
    **/
   public OuterComposite myString(String myString) {
     this.myString = myString;
@@ -57,7 +59,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setMyString(String myString) {
     this.myString = myString;
-  }/**
+  }
+
+/**
    **/
   public OuterComposite myBoolean(Boolean myBoolean) {
     this.myBoolean = myBoolean;
@@ -77,6 +81,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.myBoolean = myBoolean;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
index c0e131f545d..63e1d1abbd3 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Pet.java
@@ -80,7 +80,9 @@ public enum StatusEnum {
 
   public void setId(Long id) {
     this.id = id;
-  }/**
+  }
+
+/**
    **/
   public Pet category(Category category) {
     this.category = category;
@@ -98,7 +100,9 @@ public enum StatusEnum {
 
   public void setCategory(Category category) {
     this.category = category;
-  }/**
+  }
+
+/**
    **/
   public Pet name(String name) {
     this.name = name;
@@ -117,7 +121,9 @@ public enum StatusEnum {
 
   public void setName(String name) {
     this.name = name;
-  }/**
+  }
+
+/**
    **/
   public Pet photoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
@@ -136,7 +142,9 @@ public enum StatusEnum {
 
   public void setPhotoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
-  }/**
+  }
+
+/**
    **/
   public Pet tags(List<Tag> tags) {
     this.tags = tags;
@@ -154,7 +162,9 @@ public enum StatusEnum {
 
   public void setTags(List<Tag> tags) {
     this.tags = tags;
-  }/**
+  }
+
+/**
    * pet status in the store
    **/
   public Pet status(StatusEnum status) {
@@ -175,6 +185,7 @@ public enum StatusEnum {
     this.status = status;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
index 8ab6292e7f6..72efcebf52c 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
@@ -37,7 +37,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setBar(String bar) {
     this.bar = bar;
-  }/**
+  }
+
+/**
    **/
   public ReadOnlyFirst baz(String baz) {
     this.baz = baz;
@@ -57,6 +59,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.baz = baz;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
index 61f7ae1e722..ece6b68dc3a 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/SpecialModelName.java
@@ -38,6 +38,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.$specialPropertyName = $specialPropertyName;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
index 5f855730981..1c7c5198894 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/Tag.java
@@ -37,7 +37,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setId(Long id) {
     this.id = id;
-  }/**
+  }
+
+/**
    **/
   public Tag name(String name) {
     this.name = name;
@@ -57,6 +59,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.name = name;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java
index 8ad93d7553d..502c22c455e 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderDefault.java
@@ -44,7 +44,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderDefault numberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
@@ -63,7 +65,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderDefault integerItem(Integer integerItem) {
     this.integerItem = integerItem;
@@ -82,7 +86,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderDefault boolItem(Boolean boolItem) {
     this.boolItem = boolItem;
@@ -101,7 +107,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
@@ -122,6 +130,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.arrayItem = arrayItem;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java
index fe7be2d28e3..fb31859dedd 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/TypeHolderExample.java
@@ -45,7 +45,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setStringItem(String stringItem) {
     this.stringItem = stringItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderExample numberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
@@ -64,7 +66,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNumberItem(BigDecimal numberItem) {
     this.numberItem = numberItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderExample floatItem(Float floatItem) {
     this.floatItem = floatItem;
@@ -83,7 +87,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setFloatItem(Float floatItem) {
     this.floatItem = floatItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderExample integerItem(Integer integerItem) {
     this.integerItem = integerItem;
@@ -102,7 +108,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setIntegerItem(Integer integerItem) {
     this.integerItem = integerItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderExample boolItem(Boolean boolItem) {
     this.boolItem = boolItem;
@@ -121,7 +129,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setBoolItem(Boolean boolItem) {
     this.boolItem = boolItem;
-  }/**
+  }
+
+/**
    **/
   public TypeHolderExample arrayItem(List<Integer> arrayItem) {
     this.arrayItem = arrayItem;
@@ -142,6 +152,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.arrayItem = arrayItem;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
index 6e82dd75fed..ad16074f63b 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/User.java
@@ -43,7 +43,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setId(Long id) {
     this.id = id;
-  }/**
+  }
+
+/**
    **/
   public User username(String username) {
     this.username = username;
@@ -61,7 +63,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setUsername(String username) {
     this.username = username;
-  }/**
+  }
+
+/**
    **/
   public User firstName(String firstName) {
     this.firstName = firstName;
@@ -79,7 +83,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setFirstName(String firstName) {
     this.firstName = firstName;
-  }/**
+  }
+
+/**
    **/
   public User lastName(String lastName) {
     this.lastName = lastName;
@@ -97,7 +103,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setLastName(String lastName) {
     this.lastName = lastName;
-  }/**
+  }
+
+/**
    **/
   public User email(String email) {
     this.email = email;
@@ -115,7 +123,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setEmail(String email) {
     this.email = email;
-  }/**
+  }
+
+/**
    **/
   public User password(String password) {
     this.password = password;
@@ -133,7 +143,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPassword(String password) {
     this.password = password;
-  }/**
+  }
+
+/**
    **/
   public User phone(String phone) {
     this.phone = phone;
@@ -151,7 +163,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPhone(String phone) {
     this.phone = phone;
-  }/**
+  }
+
+/**
    * User Status
    **/
   public User userStatus(Integer userStatus) {
@@ -172,6 +186,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.userStatus = userStatus;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java
index 596002cf3a0..15a5d35673f 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/XmlItem.java
@@ -67,7 +67,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setAttributeString(String attributeString) {
     this.attributeString = attributeString;
-  }/**
+  }
+
+/**
    **/
   public XmlItem attributeNumber(BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
@@ -85,7 +87,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setAttributeNumber(BigDecimal attributeNumber) {
     this.attributeNumber = attributeNumber;
-  }/**
+  }
+
+/**
    **/
   public XmlItem attributeInteger(Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
@@ -103,7 +107,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setAttributeInteger(Integer attributeInteger) {
     this.attributeInteger = attributeInteger;
-  }/**
+  }
+
+/**
    **/
   public XmlItem attributeBoolean(Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
@@ -121,7 +127,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setAttributeBoolean(Boolean attributeBoolean) {
     this.attributeBoolean = attributeBoolean;
-  }/**
+  }
+
+/**
    **/
   public XmlItem wrappedArray(List<Integer> wrappedArray) {
     this.wrappedArray = wrappedArray;
@@ -139,7 +147,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setWrappedArray(List<Integer> wrappedArray) {
     this.wrappedArray = wrappedArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem nameString(String nameString) {
     this.nameString = nameString;
@@ -157,7 +167,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNameString(String nameString) {
     this.nameString = nameString;
-  }/**
+  }
+
+/**
    **/
   public XmlItem nameNumber(BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
@@ -175,7 +187,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNameNumber(BigDecimal nameNumber) {
     this.nameNumber = nameNumber;
-  }/**
+  }
+
+/**
    **/
   public XmlItem nameInteger(Integer nameInteger) {
     this.nameInteger = nameInteger;
@@ -193,7 +207,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNameInteger(Integer nameInteger) {
     this.nameInteger = nameInteger;
-  }/**
+  }
+
+/**
    **/
   public XmlItem nameBoolean(Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
@@ -211,7 +227,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNameBoolean(Boolean nameBoolean) {
     this.nameBoolean = nameBoolean;
-  }/**
+  }
+
+/**
    **/
   public XmlItem nameArray(List<Integer> nameArray) {
     this.nameArray = nameArray;
@@ -229,7 +247,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNameArray(List<Integer> nameArray) {
     this.nameArray = nameArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
     this.nameWrappedArray = nameWrappedArray;
@@ -247,7 +267,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNameWrappedArray(List<Integer> nameWrappedArray) {
     this.nameWrappedArray = nameWrappedArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixString(String prefixString) {
     this.prefixString = prefixString;
@@ -265,7 +287,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixString(String prefixString) {
     this.prefixString = prefixString;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixNumber(BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
@@ -283,7 +307,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixNumber(BigDecimal prefixNumber) {
     this.prefixNumber = prefixNumber;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixInteger(Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
@@ -301,7 +327,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixInteger(Integer prefixInteger) {
     this.prefixInteger = prefixInteger;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixBoolean(Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
@@ -319,7 +347,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixBoolean(Boolean prefixBoolean) {
     this.prefixBoolean = prefixBoolean;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixArray(List<Integer> prefixArray) {
     this.prefixArray = prefixArray;
@@ -337,7 +367,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixArray(List<Integer> prefixArray) {
     this.prefixArray = prefixArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
     this.prefixWrappedArray = prefixWrappedArray;
@@ -355,7 +387,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
     this.prefixWrappedArray = prefixWrappedArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem namespaceString(String namespaceString) {
     this.namespaceString = namespaceString;
@@ -373,7 +407,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNamespaceString(String namespaceString) {
     this.namespaceString = namespaceString;
-  }/**
+  }
+
+/**
    **/
   public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
@@ -391,7 +427,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNamespaceNumber(BigDecimal namespaceNumber) {
     this.namespaceNumber = namespaceNumber;
-  }/**
+  }
+
+/**
    **/
   public XmlItem namespaceInteger(Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
@@ -409,7 +447,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNamespaceInteger(Integer namespaceInteger) {
     this.namespaceInteger = namespaceInteger;
-  }/**
+  }
+
+/**
    **/
   public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
@@ -427,7 +467,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNamespaceBoolean(Boolean namespaceBoolean) {
     this.namespaceBoolean = namespaceBoolean;
-  }/**
+  }
+
+/**
    **/
   public XmlItem namespaceArray(List<Integer> namespaceArray) {
     this.namespaceArray = namespaceArray;
@@ -445,7 +487,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNamespaceArray(List<Integer> namespaceArray) {
     this.namespaceArray = namespaceArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
     this.namespaceWrappedArray = namespaceWrappedArray;
@@ -463,7 +507,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
     this.namespaceWrappedArray = namespaceWrappedArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixNsString(String prefixNsString) {
     this.prefixNsString = prefixNsString;
@@ -481,7 +527,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixNsString(String prefixNsString) {
     this.prefixNsString = prefixNsString;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
@@ -499,7 +547,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
     this.prefixNsNumber = prefixNsNumber;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
@@ -517,7 +567,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixNsInteger(Integer prefixNsInteger) {
     this.prefixNsInteger = prefixNsInteger;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
@@ -535,7 +587,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
     this.prefixNsBoolean = prefixNsBoolean;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
     this.prefixNsArray = prefixNsArray;
@@ -553,7 +607,9 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
   public void setPrefixNsArray(List<Integer> prefixNsArray) {
     this.prefixNsArray = prefixNsArray;
-  }/**
+  }
+
+/**
    **/
   public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
     this.prefixNsWrappedArray = prefixNsWrappedArray;
@@ -573,6 +629,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
     this.prefixNsWrappedArray = prefixNsWrappedArray;
   }
 
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
index da95378bbc8..7d2de524fc6 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml
@@ -2225,10 +2225,12 @@ components:
       properties:
         breed:
           type: string
+      type: object
     Cat_allOf:
       properties:
         declawed:
           type: boolean
+      type: object
     BigCat_allOf:
       properties:
         kind:
@@ -2238,6 +2240,7 @@ components:
           - leopards
           - jaguars
           type: string
+      type: object
   securitySchemes:
     petstore_auth:
       flows:
@@ -2258,3 +2261,4 @@ components:
     http_basic_test:
       scheme: basic
       type: http
+x-original-swagger-version: "2.0"
-- 
GitLab