Migrate generated tests for java resttemplate generator updateFeature/resttemplate junit5 (#18222)

* update(resttemplate): migrate java resttemplate templates to junit 5

* update(java defaults): migrate java defaults as well because resttemplate uses model_tests from default

* update(samples, java): update samples as described in the contribution guidelines

* fix tests: try double quotes

* fix tests: remaining double quotes

* update(samples): regenerate resttemplate

* update(samples): regenerate resttemplate-jakarta

* update(samples): regenerate resttemplate-swagger1

* update(samples): regenerate resttemplate-swagger2

* update(samples): regenerate resttemplate-withXml

* update(samples again): ./bin/generate-samples.sh ./bin/configs/*.yaml

modules/openapi-generator/src/main/resources/Java/api_test.mustache

@@ -5,9 +5,9 @@ package {{package}};
 import {{invokerPackage}}.ApiException;
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * API tests for {{classname}}
  */
-public class {{classname}}Test {
+class {{classname}}Test {
 
     private final {{classname}} api = new {{classname}}();
 
@@ -38,7 +38,7 @@ public class {{classname}}Test {
      *          if the Api call fails
      */
     @Test
-    public void {{operationId}}Test() throws ApiException {
+    void {{operationId}}Test() throws ApiException {
         //{{#allParams}}
         //{{{dataType}}} {{paramName}} = null;
         //{{/allParams}}

modules/openapi-generator/src/main/resources/Java/build.gradle.mustache

@@ -125,7 +125,7 @@ ext {
     {{/useBeanValidation}}
     jersey_version = "1.19.4"
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -149,4 +149,20 @@ dependencies {
     implementation "jakarta.validation:jakarta.validation-api:$bean_validation_version"
     {{/useBeanValidation}}
     testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache

@@ -4,8 +4,9 @@ package {{package}};
 
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -17,8 +18,8 @@ import java.util.Map;
 /**
  * API tests for {{classname}}
  */
-@Ignore
+@Disabled
-public class {{classname}}Test {
+class {{classname}}Test {
 
     private final {{classname}} api = new {{classname}}();
 
@@ -28,11 +29,11 @@ public class {{classname}}Test {
      *
      * {{notes}}
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void {{operationId}}Test() {
+    void {{operationId}}Test() {
         {{#allParams}}
         {{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection<org.springframework.core.io.Resource>{{/collectionFormat}}{{^collectionFormat}}org.springframework.core.io.Resource{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}} = null;
         {{/allParams}}

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache

@@ -129,7 +129,7 @@ ext {
     jakarta_annotation_version = "1.3.5"
     {{/useJakartaEe}}
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -158,5 +158,20 @@ dependencies {
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
     {{/withXml}}
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache

@@ -76,6 +76,14 @@
                     <forkMode>pertest</forkMode>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -339,11 +347,17 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -379,6 +393,7 @@
         {{#performBeanValidation}}
         <hibernate-validator-version>5.4.3.Final</hibernate-validator-version>
         {{/performBeanValidation}}
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

modules/openapi-generator/src/main/resources/Java/model_test.mustache

@@ -4,14 +4,14 @@ package {{package}};
 
 {{#imports}}import {{import}};
 {{/imports}}
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for {{classname}}
  */
-public class {{classname}}Test {
+class {{classname}}Test {
     {{#models}}
     {{#model}}
     {{^vendorExtensions.x-is-one-of-interface}}
@@ -23,7 +23,7 @@ public class {{classname}}Test {
      * Model tests for {{classname}}
      */
     @Test
-    public void test{{classname}}() {
+    void test{{classname}}() {
         // TODO: test {{classname}}
     }
 
@@ -32,7 +32,7 @@ public class {{classname}}Test {
      * Test the property '{{name}}'
      */
     @Test
-    public void {{name}}Test() {
+    void {{name}}Test() {
         // TODO: test {{name}}
     }
 

modules/openapi-generator/src/main/resources/Java/pom.mustache

@@ -92,6 +92,14 @@
                     <parallel>methods</parallel>
                     <forkMode>pertest</forkMode>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -335,11 +343,17 @@
         </dependency>
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -362,6 +376,7 @@
         <beanvalidation-version>3.0.2</beanvalidation-version>
 {{/useBeanValidation}}
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/echo_api/java/resttemplate/build.gradle

@@ -103,7 +103,7 @@ ext {
     spring_web_version = "5.3.32"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -117,5 +117,20 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

samples/client/echo_api/java/resttemplate/pom.xml

@@ -69,6 +69,14 @@
                     <forkMode>pertest</forkMode>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -258,11 +266,17 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -271,6 +285,7 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/others/java/resttemplate-useAbstractionForFiles/build.gradle

@@ -103,7 +103,7 @@ ext {
     spring_web_version = "5.3.32"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -117,5 +117,20 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

samples/client/others/java/resttemplate-useAbstractionForFiles/pom.xml

@@ -69,6 +69,14 @@
                     <forkMode>pertest</forkMode>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -258,11 +266,17 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -271,6 +285,7 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/petstore/java/resttemplate-jakarta/build.gradle

@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.0.17"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -117,5 +117,20 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

samples/client/petstore/java/resttemplate-jakarta/pom.xml

@@ -69,6 +69,14 @@
                     <forkMode>pertest</forkMode>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -258,11 +266,17 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -271,6 +285,7 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/api/PetApiTest.java

@@ -16,8 +16,9 @@ package org.openapitools.client.api;
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,8 +30,8 @@ import java.util.Map;
 /**
  * API tests for PetApi
  */
-@Ignore
+@Disabled
-public class PetApiTest {
+class PetApiTest {
 
     private final PetApi api = new PetApi();
 
@@ -40,12 +41,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void addPetTest() {
+    void addPetTest() {
         Pet pet = null;
+
         Pet response = api.addPet(pet);
 
         // TODO: test validations
@@ -56,13 +58,14 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deletePetTest() {
+    void deletePetTest() {
         Long petId = null;
         String apiKey = null;
+
         api.deletePet(petId, apiKey);
 
         // TODO: test validations
@@ -73,12 +76,13 @@ public class PetApiTest {
      *
      * Multiple status values can be provided with comma separated strings
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByStatusTest() {
+    void findPetsByStatusTest() {
         List<String> status = null;
+
         List<Pet> response = api.findPetsByStatus(status);
 
         // TODO: test validations
@@ -89,12 +93,13 @@ public class PetApiTest {
      *
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByTagsTest() {
+    void findPetsByTagsTest() {
         List<String> tags = null;
+
         List<Pet> response = api.findPetsByTags(tags);
 
         // TODO: test validations
@@ -105,12 +110,13 @@ public class PetApiTest {
      *
      * Returns a single pet
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getPetByIdTest() {
+    void getPetByIdTest() {
         Long petId = null;
+
         Pet response = api.getPetById(petId);
 
         // TODO: test validations
@@ -121,12 +127,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetTest() {
+    void updatePetTest() {
         Pet pet = null;
+
         Pet response = api.updatePet(pet);
 
         // TODO: test validations
@@ -137,14 +144,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetWithFormTest() {
+    void updatePetWithFormTest() {
         Long petId = null;
         String name = null;
         String status = null;
+
         api.updatePetWithForm(petId, name, status);
 
         // TODO: test validations
@@ -155,14 +163,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void uploadFileTest() {
+    void uploadFileTest() {
         Long petId = null;
         String additionalMetadata = null;
         File _file = null;
+
         ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/api/StoreApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for StoreApi
  */
-@Ignore
+@Disabled
-public class StoreApiTest {
+class StoreApiTest {
 
     private final StoreApi api = new StoreApi();
 
@@ -38,12 +39,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteOrderTest() {
+    void deleteOrderTest() {
         String orderId = null;
+
         api.deleteOrder(orderId);
 
         // TODO: test validations
@@ -54,11 +56,12 @@ public class StoreApiTest {
      *
      * Returns a map of status codes to quantities
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getInventoryTest() {
+    void getInventoryTest() {
+
         Map<String, Integer> response = api.getInventory();
 
         // TODO: test validations
@@ -69,12 +72,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generate exceptions
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getOrderByIdTest() {
+    void getOrderByIdTest() {
         Long orderId = null;
+
         Order response = api.getOrderById(orderId);
 
         // TODO: test validations
@@ -85,12 +89,13 @@ public class StoreApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void placeOrderTest() {
+    void placeOrderTest() {
         Order order = null;
+
         Order response = api.placeOrder(order);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/api/UserApiTest.java

@@ -15,8 +15,9 @@ package org.openapitools.client.api;
 
 import java.time.OffsetDateTime;
 import org.openapitools.client.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -28,8 +29,8 @@ import java.util.Map;
 /**
  * API tests for UserApi
  */
-@Ignore
+@Disabled
-public class UserApiTest {
+class UserApiTest {
 
     private final UserApi api = new UserApi();
 
@@ -39,12 +40,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUserTest() {
+    void createUserTest() {
         User user = null;
+
         api.createUser(user);
 
         // TODO: test validations
@@ -55,12 +57,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithArrayInputTest() {
+    void createUsersWithArrayInputTest() {
         List<User> user = null;
+
         api.createUsersWithArrayInput(user);
 
         // TODO: test validations
@@ -71,12 +74,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithListInputTest() {
+    void createUsersWithListInputTest() {
         List<User> user = null;
+
         api.createUsersWithListInput(user);
 
         // TODO: test validations
@@ -87,12 +91,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteUserTest() {
+    void deleteUserTest() {
         String username = null;
+
         api.deleteUser(username);
 
         // TODO: test validations
@@ -103,12 +108,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getUserByNameTest() {
+    void getUserByNameTest() {
         String username = null;
+
         User response = api.getUserByName(username);
 
         // TODO: test validations
@@ -119,13 +125,14 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void loginUserTest() {
+    void loginUserTest() {
         String username = null;
         String password = null;
+
         String response = api.loginUser(username, password);
 
         // TODO: test validations
@@ -136,11 +143,12 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void logoutUserTest() {
+    void logoutUserTest() {
+
         api.logoutUser();
 
         // TODO: test validations
@@ -151,13 +159,14 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updateUserTest() {
+    void updateUserTest() {
         String username = null;
         User user = null;
+
         api.updateUser(username, user);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/model/CategoryTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Category
  */
-public class CategoryTest {
+class CategoryTest {
     private final Category model = new Category();
 
     /**
      * Model tests for Category
      */
     @Test
-    public void testCategory() {
+    void testCategory() {
         // TODO: test Category
     }
 
@@ -41,7 +40,7 @@ public class CategoryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -49,7 +48,7 @@ public class CategoryTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ModelApiResponse
  */
-public class ModelApiResponseTest {
+class ModelApiResponseTest {
     private final ModelApiResponse model = new ModelApiResponse();
 
     /**
      * Model tests for ModelApiResponse
      */
     @Test
-    public void testModelApiResponse() {
+    void testModelApiResponse() {
         // TODO: test ModelApiResponse
     }
 
@@ -41,7 +40,7 @@ public class ModelApiResponseTest {
      * Test the property 'code'
      */
     @Test
-    public void codeTest() {
+    void codeTest() {
         // TODO: test code
     }
 
@@ -49,7 +48,7 @@ public class ModelApiResponseTest {
      * Test the property 'type'
      */
     @Test
-    public void typeTest() {
+    void typeTest() {
         // TODO: test type
     }
 
@@ -57,7 +56,7 @@ public class ModelApiResponseTest {
      * Test the property 'message'
      */
     @Test
-    public void messageTest() {
+    void messageTest() {
         // TODO: test message
     }
 

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/model/OrderTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.time.OffsetDateTime;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Order
  */
-public class OrderTest {
+class OrderTest {
     private final Order model = new Order();
 
     /**
      * Model tests for Order
      */
     @Test
-    public void testOrder() {
+    void testOrder() {
         // TODO: test Order
     }
 
@@ -42,7 +41,7 @@ public class OrderTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -50,7 +49,7 @@ public class OrderTest {
      * Test the property 'petId'
      */
     @Test
-    public void petIdTest() {
+    void petIdTest() {
         // TODO: test petId
     }
 
@@ -58,7 +57,7 @@ public class OrderTest {
      * Test the property 'quantity'
      */
     @Test
-    public void quantityTest() {
+    void quantityTest() {
         // TODO: test quantity
     }
 
@@ -66,7 +65,7 @@ public class OrderTest {
      * Test the property 'shipDate'
      */
     @Test
-    public void shipDateTest() {
+    void shipDateTest() {
         // TODO: test shipDate
     }
 
@@ -74,7 +73,7 @@ public class OrderTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 
@@ -82,7 +81,7 @@ public class OrderTest {
      * Test the property 'complete'
      */
     @Test
-    public void completeTest() {
+    void completeTest() {
         // TODO: test complete
     }
 

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/model/PetTest.java

@@ -19,25 +19,25 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Pet
  */
-public class PetTest {
+class PetTest {
     private final Pet model = new Pet();
 
     /**
      * Model tests for Pet
      */
     @Test
-    public void testPet() {
+    void testPet() {
         // TODO: test Pet
     }
 
@@ -45,7 +45,7 @@ public class PetTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -53,7 +53,7 @@ public class PetTest {
      * Test the property 'category'
      */
     @Test
-    public void categoryTest() {
+    void categoryTest() {
         // TODO: test category
     }
 
@@ -61,7 +61,7 @@ public class PetTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -69,7 +69,7 @@ public class PetTest {
      * Test the property 'photoUrls'
      */
     @Test
-    public void photoUrlsTest() {
+    void photoUrlsTest() {
         // TODO: test photoUrls
     }
 
@@ -77,7 +77,7 @@ public class PetTest {
      * Test the property 'tags'
      */
     @Test
-    public void tagsTest() {
+    void tagsTest() {
         // TODO: test tags
     }
 
@@ -85,7 +85,7 @@ public class PetTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/model/TagTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Tag
  */
-public class TagTest {
+class TagTest {
     private final Tag model = new Tag();
 
     /**
      * Model tests for Tag
      */
     @Test
-    public void testTag() {
+    void testTag() {
         // TODO: test Tag
     }
 
@@ -41,7 +40,7 @@ public class TagTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -49,7 +48,7 @@ public class TagTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-jakarta/src/test/java/org/openapitools/client/model/UserTest.java

@@ -18,22 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for User
  */
-public class UserTest {
+class UserTest {
     private final User model = new User();
 
     /**
      * Model tests for User
      */
     @Test
-    public void testUser() {
+    void testUser() {
         // TODO: test User
     }
 
@@ -41,7 +40,7 @@ public class UserTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -49,7 +48,7 @@ public class UserTest {
      * Test the property 'username'
      */
     @Test
-    public void usernameTest() {
+    void usernameTest() {
         // TODO: test username
     }
 
@@ -57,7 +56,7 @@ public class UserTest {
      * Test the property 'firstName'
      */
     @Test
-    public void firstNameTest() {
+    void firstNameTest() {
         // TODO: test firstName
     }
 
@@ -65,7 +64,7 @@ public class UserTest {
      * Test the property 'lastName'
      */
     @Test
-    public void lastNameTest() {
+    void lastNameTest() {
         // TODO: test lastName
     }
 
@@ -73,7 +72,7 @@ public class UserTest {
      * Test the property 'email'
      */
     @Test
-    public void emailTest() {
+    void emailTest() {
         // TODO: test email
     }
 
@@ -81,7 +80,7 @@ public class UserTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -89,7 +88,7 @@ public class UserTest {
      * Test the property 'phone'
      */
     @Test
-    public void phoneTest() {
+    void phoneTest() {
         // TODO: test phone
     }
 
@@ -97,7 +96,7 @@ public class UserTest {
      * Test the property 'userStatus'
      */
     @Test
-    public void userStatusTest() {
+    void userStatusTest() {
         // TODO: test userStatus
     }
 

samples/client/petstore/java/resttemplate-swagger1/build.gradle

@@ -104,7 +104,7 @@ ext {
     spring_web_version = "5.3.32"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -119,5 +119,20 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

samples/client/petstore/java/resttemplate-swagger1/pom.xml

@@ -69,6 +69,14 @@
                     <forkMode>pertest</forkMode>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -263,11 +271,17 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -277,6 +291,7 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/api/PetApiTest.java

@@ -16,8 +16,9 @@ package org.openapitools.client.api;
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,8 +30,8 @@ import java.util.Map;
 /**
  * API tests for PetApi
  */
-@Ignore
+@Disabled
-public class PetApiTest {
+class PetApiTest {
 
     private final PetApi api = new PetApi();
 
@@ -40,12 +41,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void addPetTest() {
+    void addPetTest() {
         Pet pet = null;
+
         Pet response = api.addPet(pet);
 
         // TODO: test validations
@@ -56,13 +58,14 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deletePetTest() {
+    void deletePetTest() {
         Long petId = null;
         String apiKey = null;
+
         api.deletePet(petId, apiKey);
 
         // TODO: test validations
@@ -73,12 +76,13 @@ public class PetApiTest {
      *
      * Multiple status values can be provided with comma separated strings
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByStatusTest() {
+    void findPetsByStatusTest() {
         List<String> status = null;
+
         List<Pet> response = api.findPetsByStatus(status);
 
         // TODO: test validations
@@ -89,12 +93,13 @@ public class PetApiTest {
      *
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByTagsTest() {
+    void findPetsByTagsTest() {
         List<String> tags = null;
+
         List<Pet> response = api.findPetsByTags(tags);
 
         // TODO: test validations
@@ -105,12 +110,13 @@ public class PetApiTest {
      *
      * Returns a single pet
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getPetByIdTest() {
+    void getPetByIdTest() {
         Long petId = null;
+
         Pet response = api.getPetById(petId);
 
         // TODO: test validations
@@ -121,12 +127,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetTest() {
+    void updatePetTest() {
         Pet pet = null;
+
         Pet response = api.updatePet(pet);
 
         // TODO: test validations
@@ -137,14 +144,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetWithFormTest() {
+    void updatePetWithFormTest() {
         Long petId = null;
         String name = null;
         String status = null;
+
         api.updatePetWithForm(petId, name, status);
 
         // TODO: test validations
@@ -155,14 +163,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void uploadFileTest() {
+    void uploadFileTest() {
         Long petId = null;
         String additionalMetadata = null;
         File _file = null;
+
         ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/api/StoreApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for StoreApi
  */
-@Ignore
+@Disabled
-public class StoreApiTest {
+class StoreApiTest {
 
     private final StoreApi api = new StoreApi();
 
@@ -38,12 +39,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteOrderTest() {
+    void deleteOrderTest() {
         String orderId = null;
+
         api.deleteOrder(orderId);
 
         // TODO: test validations
@@ -54,11 +56,12 @@ public class StoreApiTest {
      *
      * Returns a map of status codes to quantities
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getInventoryTest() {
+    void getInventoryTest() {
+
         Map<String, Integer> response = api.getInventory();
 
         // TODO: test validations
@@ -69,12 +72,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generate exceptions
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getOrderByIdTest() {
+    void getOrderByIdTest() {
         Long orderId = null;
+
         Order response = api.getOrderById(orderId);
 
         // TODO: test validations
@@ -85,12 +89,13 @@ public class StoreApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void placeOrderTest() {
+    void placeOrderTest() {
         Order order = null;
+
         Order response = api.placeOrder(order);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/api/UserApiTest.java

@@ -15,8 +15,9 @@ package org.openapitools.client.api;
 
 import java.time.OffsetDateTime;
 import org.openapitools.client.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -28,8 +29,8 @@ import java.util.Map;
 /**
  * API tests for UserApi
  */
-@Ignore
+@Disabled
-public class UserApiTest {
+class UserApiTest {
 
     private final UserApi api = new UserApi();
 
@@ -39,12 +40,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUserTest() {
+    void createUserTest() {
         User user = null;
+
         api.createUser(user);
 
         // TODO: test validations
@@ -55,12 +57,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithArrayInputTest() {
+    void createUsersWithArrayInputTest() {
         List<User> user = null;
+
         api.createUsersWithArrayInput(user);
 
         // TODO: test validations
@@ -71,12 +74,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithListInputTest() {
+    void createUsersWithListInputTest() {
         List<User> user = null;
+
         api.createUsersWithListInput(user);
 
         // TODO: test validations
@@ -87,12 +91,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteUserTest() {
+    void deleteUserTest() {
         String username = null;
+
         api.deleteUser(username);
 
         // TODO: test validations
@@ -103,12 +108,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getUserByNameTest() {
+    void getUserByNameTest() {
         String username = null;
+
         User response = api.getUserByName(username);
 
         // TODO: test validations
@@ -119,13 +125,14 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void loginUserTest() {
+    void loginUserTest() {
         String username = null;
         String password = null;
+
         String response = api.loginUser(username, password);
 
         // TODO: test validations
@@ -136,11 +143,12 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void logoutUserTest() {
+    void logoutUserTest() {
+
         api.logoutUser();
 
         // TODO: test validations
@@ -151,13 +159,14 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updateUserTest() {
+    void updateUserTest() {
         String username = null;
         User user = null;
+
         api.updateUser(username, user);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/model/CategoryTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Category
  */
-public class CategoryTest {
+class CategoryTest {
     private final Category model = new Category();
 
     /**
      * Model tests for Category
      */
     @Test
-    public void testCategory() {
+    void testCategory() {
         // TODO: test Category
     }
 
@@ -43,7 +42,7 @@ public class CategoryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -51,7 +50,7 @@ public class CategoryTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ModelApiResponse
  */
-public class ModelApiResponseTest {
+class ModelApiResponseTest {
     private final ModelApiResponse model = new ModelApiResponse();
 
     /**
      * Model tests for ModelApiResponse
      */
     @Test
-    public void testModelApiResponse() {
+    void testModelApiResponse() {
         // TODO: test ModelApiResponse
     }
 
@@ -43,7 +42,7 @@ public class ModelApiResponseTest {
      * Test the property 'code'
      */
     @Test
-    public void codeTest() {
+    void codeTest() {
         // TODO: test code
     }
 
@@ -51,7 +50,7 @@ public class ModelApiResponseTest {
      * Test the property 'type'
      */
     @Test
-    public void typeTest() {
+    void typeTest() {
         // TODO: test type
     }
 
@@ -59,7 +58,7 @@ public class ModelApiResponseTest {
      * Test the property 'message'
      */
     @Test
-    public void messageTest() {
+    void messageTest() {
         // TODO: test message
     }
 

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/model/OrderTest.java

@@ -21,22 +21,21 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Order
  */
-public class OrderTest {
+class OrderTest {
     private final Order model = new Order();
 
     /**
      * Model tests for Order
      */
     @Test
-    public void testOrder() {
+    void testOrder() {
         // TODO: test Order
     }
 
@@ -44,7 +43,7 @@ public class OrderTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -52,7 +51,7 @@ public class OrderTest {
      * Test the property 'petId'
      */
     @Test
-    public void petIdTest() {
+    void petIdTest() {
         // TODO: test petId
     }
 
@@ -60,7 +59,7 @@ public class OrderTest {
      * Test the property 'quantity'
      */
     @Test
-    public void quantityTest() {
+    void quantityTest() {
         // TODO: test quantity
     }
 
@@ -68,7 +67,7 @@ public class OrderTest {
      * Test the property 'shipDate'
      */
     @Test
-    public void shipDateTest() {
+    void shipDateTest() {
         // TODO: test shipDate
     }
 
@@ -76,7 +75,7 @@ public class OrderTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 
@@ -84,7 +83,7 @@ public class OrderTest {
      * Test the property 'complete'
      */
     @Test
-    public void completeTest() {
+    void completeTest() {
         // TODO: test complete
     }
 

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/model/PetTest.java

@@ -21,25 +21,25 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Pet
  */
-public class PetTest {
+class PetTest {
     private final Pet model = new Pet();
 
     /**
      * Model tests for Pet
      */
     @Test
-    public void testPet() {
+    void testPet() {
         // TODO: test Pet
     }
 
@@ -47,7 +47,7 @@ public class PetTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -55,7 +55,7 @@ public class PetTest {
      * Test the property 'category'
      */
     @Test
-    public void categoryTest() {
+    void categoryTest() {
         // TODO: test category
     }
 
@@ -63,7 +63,7 @@ public class PetTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -71,7 +71,7 @@ public class PetTest {
      * Test the property 'photoUrls'
      */
     @Test
-    public void photoUrlsTest() {
+    void photoUrlsTest() {
         // TODO: test photoUrls
     }
 
@@ -79,7 +79,7 @@ public class PetTest {
      * Test the property 'tags'
      */
     @Test
-    public void tagsTest() {
+    void tagsTest() {
         // TODO: test tags
     }
 
@@ -87,7 +87,7 @@ public class PetTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/model/TagTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Tag
  */
-public class TagTest {
+class TagTest {
     private final Tag model = new Tag();
 
     /**
      * Model tests for Tag
      */
     @Test
-    public void testTag() {
+    void testTag() {
         // TODO: test Tag
     }
 
@@ -43,7 +42,7 @@ public class TagTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -51,7 +50,7 @@ public class TagTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-swagger1/src/test/java/org/openapitools/client/model/UserTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for User
  */
-public class UserTest {
+class UserTest {
     private final User model = new User();
 
     /**
      * Model tests for User
      */
     @Test
-    public void testUser() {
+    void testUser() {
         // TODO: test User
     }
 
@@ -43,7 +42,7 @@ public class UserTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -51,7 +50,7 @@ public class UserTest {
      * Test the property 'username'
      */
     @Test
-    public void usernameTest() {
+    void usernameTest() {
         // TODO: test username
     }
 
@@ -59,7 +58,7 @@ public class UserTest {
      * Test the property 'firstName'
      */
     @Test
-    public void firstNameTest() {
+    void firstNameTest() {
         // TODO: test firstName
     }
 
@@ -67,7 +66,7 @@ public class UserTest {
      * Test the property 'lastName'
      */
     @Test
-    public void lastNameTest() {
+    void lastNameTest() {
         // TODO: test lastName
     }
 
@@ -75,7 +74,7 @@ public class UserTest {
      * Test the property 'email'
      */
     @Test
-    public void emailTest() {
+    void emailTest() {
         // TODO: test email
     }
 
@@ -83,7 +82,7 @@ public class UserTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -91,7 +90,7 @@ public class UserTest {
      * Test the property 'phone'
      */
     @Test
-    public void phoneTest() {
+    void phoneTest() {
         // TODO: test phone
     }
 
@@ -99,7 +98,7 @@ public class UserTest {
      * Test the property 'userStatus'
      */
     @Test
-    public void userStatusTest() {
+    void userStatusTest() {
         // TODO: test userStatus
     }
 

samples/client/petstore/java/resttemplate-swagger2/build.gradle

@@ -104,7 +104,7 @@ ext {
     spring_web_version = "5.3.32"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -119,5 +119,20 @@ dependencies {
     implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

samples/client/petstore/java/resttemplate-swagger2/pom.xml

@@ -69,6 +69,14 @@
                     <forkMode>pertest</forkMode>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -263,11 +271,17 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -277,6 +291,7 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/api/PetApiTest.java

@@ -16,8 +16,9 @@ package org.openapitools.client.api;
 import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -29,8 +30,8 @@ import java.util.Map;
 /**
  * API tests for PetApi
  */
-@Ignore
+@Disabled
-public class PetApiTest {
+class PetApiTest {
 
     private final PetApi api = new PetApi();
 
@@ -40,12 +41,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void addPetTest() {
+    void addPetTest() {
         Pet pet = null;
+
         Pet response = api.addPet(pet);
 
         // TODO: test validations
@@ -56,13 +58,14 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deletePetTest() {
+    void deletePetTest() {
         Long petId = null;
         String apiKey = null;
+
         api.deletePet(petId, apiKey);
 
         // TODO: test validations
@@ -73,12 +76,13 @@ public class PetApiTest {
      *
      * Multiple status values can be provided with comma separated strings
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByStatusTest() {
+    void findPetsByStatusTest() {
         List<String> status = null;
+
         List<Pet> response = api.findPetsByStatus(status);
 
         // TODO: test validations
@@ -89,12 +93,13 @@ public class PetApiTest {
      *
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByTagsTest() {
+    void findPetsByTagsTest() {
         List<String> tags = null;
+
         List<Pet> response = api.findPetsByTags(tags);
 
         // TODO: test validations
@@ -105,12 +110,13 @@ public class PetApiTest {
      *
      * Returns a single pet
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getPetByIdTest() {
+    void getPetByIdTest() {
         Long petId = null;
+
         Pet response = api.getPetById(petId);
 
         // TODO: test validations
@@ -121,12 +127,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetTest() {
+    void updatePetTest() {
         Pet pet = null;
+
         Pet response = api.updatePet(pet);
 
         // TODO: test validations
@@ -137,14 +144,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetWithFormTest() {
+    void updatePetWithFormTest() {
         Long petId = null;
         String name = null;
         String status = null;
+
         api.updatePetWithForm(petId, name, status);
 
         // TODO: test validations
@@ -155,14 +163,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void uploadFileTest() {
+    void uploadFileTest() {
         Long petId = null;
         String additionalMetadata = null;
         File _file = null;
+
         ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/api/StoreApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for StoreApi
  */
-@Ignore
+@Disabled
-public class StoreApiTest {
+class StoreApiTest {
 
     private final StoreApi api = new StoreApi();
 
@@ -38,12 +39,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteOrderTest() {
+    void deleteOrderTest() {
         String orderId = null;
+
         api.deleteOrder(orderId);
 
         // TODO: test validations
@@ -54,11 +56,12 @@ public class StoreApiTest {
      *
      * Returns a map of status codes to quantities
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getInventoryTest() {
+    void getInventoryTest() {
+
         Map<String, Integer> response = api.getInventory();
 
         // TODO: test validations
@@ -69,12 +72,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generate exceptions
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getOrderByIdTest() {
+    void getOrderByIdTest() {
         Long orderId = null;
+
         Order response = api.getOrderById(orderId);
 
         // TODO: test validations
@@ -85,12 +89,13 @@ public class StoreApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void placeOrderTest() {
+    void placeOrderTest() {
         Order order = null;
+
         Order response = api.placeOrder(order);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/api/UserApiTest.java

@@ -15,8 +15,9 @@ package org.openapitools.client.api;
 
 import java.time.OffsetDateTime;
 import org.openapitools.client.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -28,8 +29,8 @@ import java.util.Map;
 /**
  * API tests for UserApi
  */
-@Ignore
+@Disabled
-public class UserApiTest {
+class UserApiTest {
 
     private final UserApi api = new UserApi();
 
@@ -39,12 +40,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUserTest() {
+    void createUserTest() {
         User user = null;
+
         api.createUser(user);
 
         // TODO: test validations
@@ -55,12 +57,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithArrayInputTest() {
+    void createUsersWithArrayInputTest() {
         List<User> user = null;
+
         api.createUsersWithArrayInput(user);
 
         // TODO: test validations
@@ -71,12 +74,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithListInputTest() {
+    void createUsersWithListInputTest() {
         List<User> user = null;
+
         api.createUsersWithListInput(user);
 
         // TODO: test validations
@@ -87,12 +91,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteUserTest() {
+    void deleteUserTest() {
         String username = null;
+
         api.deleteUser(username);
 
         // TODO: test validations
@@ -103,12 +108,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getUserByNameTest() {
+    void getUserByNameTest() {
         String username = null;
+
         User response = api.getUserByName(username);
 
         // TODO: test validations
@@ -119,13 +125,14 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void loginUserTest() {
+    void loginUserTest() {
         String username = null;
         String password = null;
+
         String response = api.loginUser(username, password);
 
         // TODO: test validations
@@ -136,11 +143,12 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void logoutUserTest() {
+    void logoutUserTest() {
+
         api.logoutUser();
 
         // TODO: test validations
@@ -151,13 +159,14 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updateUserTest() {
+    void updateUserTest() {
         String username = null;
         User user = null;
+
         api.updateUser(username, user);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/model/CategoryTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Category
  */
-public class CategoryTest {
+class CategoryTest {
     private final Category model = new Category();
 
     /**
      * Model tests for Category
      */
     @Test
-    public void testCategory() {
+    void testCategory() {
         // TODO: test Category
     }
 
@@ -42,7 +41,7 @@ public class CategoryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -50,7 +49,7 @@ public class CategoryTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for ModelApiResponse
  */
-public class ModelApiResponseTest {
+class ModelApiResponseTest {
     private final ModelApiResponse model = new ModelApiResponse();
 
     /**
      * Model tests for ModelApiResponse
      */
     @Test
-    public void testModelApiResponse() {
+    void testModelApiResponse() {
         // TODO: test ModelApiResponse
     }
 
@@ -42,7 +41,7 @@ public class ModelApiResponseTest {
      * Test the property 'code'
      */
     @Test
-    public void codeTest() {
+    void codeTest() {
         // TODO: test code
     }
 
@@ -50,7 +49,7 @@ public class ModelApiResponseTest {
      * Test the property 'type'
      */
     @Test
-    public void typeTest() {
+    void typeTest() {
         // TODO: test type
     }
 
@@ -58,7 +57,7 @@ public class ModelApiResponseTest {
      * Test the property 'message'
      */
     @Test
-    public void messageTest() {
+    void messageTest() {
         // TODO: test message
     }
 

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/model/OrderTest.java

@@ -20,22 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.OffsetDateTime;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Order
  */
-public class OrderTest {
+class OrderTest {
     private final Order model = new Order();
 
     /**
      * Model tests for Order
      */
     @Test
-    public void testOrder() {
+    void testOrder() {
         // TODO: test Order
     }
 
@@ -43,7 +42,7 @@ public class OrderTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -51,7 +50,7 @@ public class OrderTest {
      * Test the property 'petId'
      */
     @Test
-    public void petIdTest() {
+    void petIdTest() {
         // TODO: test petId
     }
 
@@ -59,7 +58,7 @@ public class OrderTest {
      * Test the property 'quantity'
      */
     @Test
-    public void quantityTest() {
+    void quantityTest() {
         // TODO: test quantity
     }
 
@@ -67,7 +66,7 @@ public class OrderTest {
      * Test the property 'shipDate'
      */
     @Test
-    public void shipDateTest() {
+    void shipDateTest() {
         // TODO: test shipDate
     }
 
@@ -75,7 +74,7 @@ public class OrderTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 
@@ -83,7 +82,7 @@ public class OrderTest {
      * Test the property 'complete'
      */
     @Test
-    public void completeTest() {
+    void completeTest() {
         // TODO: test complete
     }
 

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/model/PetTest.java

@@ -20,25 +20,25 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.Category;
 import org.openapitools.client.model.Tag;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Pet
  */
-public class PetTest {
+class PetTest {
     private final Pet model = new Pet();
 
     /**
      * Model tests for Pet
      */
     @Test
-    public void testPet() {
+    void testPet() {
         // TODO: test Pet
     }
 
@@ -46,7 +46,7 @@ public class PetTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -54,7 +54,7 @@ public class PetTest {
      * Test the property 'category'
      */
     @Test
-    public void categoryTest() {
+    void categoryTest() {
         // TODO: test category
     }
 
@@ -62,7 +62,7 @@ public class PetTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -70,7 +70,7 @@ public class PetTest {
      * Test the property 'photoUrls'
      */
     @Test
-    public void photoUrlsTest() {
+    void photoUrlsTest() {
         // TODO: test photoUrls
     }
 
@@ -78,7 +78,7 @@ public class PetTest {
      * Test the property 'tags'
      */
     @Test
-    public void tagsTest() {
+    void tagsTest() {
         // TODO: test tags
     }
 
@@ -86,7 +86,7 @@ public class PetTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/model/TagTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for Tag
  */
-public class TagTest {
+class TagTest {
     private final Tag model = new Tag();
 
     /**
      * Model tests for Tag
      */
     @Test
-    public void testTag() {
+    void testTag() {
         // TODO: test Tag
     }
 
@@ -42,7 +41,7 @@ public class TagTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -50,7 +49,7 @@ public class TagTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-swagger2/src/test/java/org/openapitools/client/model/UserTest.java

@@ -19,22 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-
 
 /**
  * Model tests for User
  */
-public class UserTest {
+class UserTest {
     private final User model = new User();
 
     /**
      * Model tests for User
      */
     @Test
-    public void testUser() {
+    void testUser() {
         // TODO: test User
     }
 
@@ -42,7 +41,7 @@ public class UserTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -50,7 +49,7 @@ public class UserTest {
      * Test the property 'username'
      */
     @Test
-    public void usernameTest() {
+    void usernameTest() {
         // TODO: test username
     }
 
@@ -58,7 +57,7 @@ public class UserTest {
      * Test the property 'firstName'
      */
     @Test
-    public void firstNameTest() {
+    void firstNameTest() {
         // TODO: test firstName
     }
 
@@ -66,7 +65,7 @@ public class UserTest {
      * Test the property 'lastName'
      */
     @Test
-    public void lastNameTest() {
+    void lastNameTest() {
         // TODO: test lastName
     }
 
@@ -74,7 +73,7 @@ public class UserTest {
      * Test the property 'email'
      */
     @Test
-    public void emailTest() {
+    void emailTest() {
         // TODO: test email
     }
 
@@ -82,7 +81,7 @@ public class UserTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -90,7 +89,7 @@ public class UserTest {
      * Test the property 'phone'
      */
     @Test
-    public void phoneTest() {
+    void phoneTest() {
         // TODO: test phone
     }
 
@@ -98,7 +97,7 @@ public class UserTest {
      * Test the property 'userStatus'
      */
     @Test
-    public void userStatusTest() {
+    void userStatusTest() {
         // TODO: test userStatus
     }
 

samples/client/petstore/java/resttemplate-withXml/build.gradle

@@ -103,7 +103,7 @@ ext {
     spring_web_version = "5.3.32"
     jakarta_annotation_version = "1.3.5"
     jodatime_version = "2.9.9"
-    junit_version = "4.13.2"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -118,5 +118,20 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
 }

samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesAnyType.md

@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesAnyType
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**name** | **String** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesArray.md

@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesArray
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**name** | **String** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesBoolean.md

@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesBoolean
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**name** | **String** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesInteger.md

@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesInteger
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**name** | **String** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesNumber.md

@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesNumber
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**name** | **String** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesObject.md

@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesObject
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**name** | **String** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesString.md

@@ -1,13 +0,0 @@
-
-
-# AdditionalPropertiesString
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**name** | **String** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/AnimalFarm.md

@@ -1,9 +0,0 @@
-
-# AnimalFarm
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/BigCat.md

@@ -1,24 +0,0 @@
-
-
-# BigCat
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**kind** | [**KindEnum**](#KindEnum) |  |  [optional] |
-
-
-
-## Enum: KindEnum
-
-| Name | Value |
-|---- | -----|
-| LIONS | "lions" |
-| TIGERS | "tigers" |
-| LEOPARDS | "leopards" |
-| JAGUARS | "jaguars" |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/StringBooleanMap.md

@@ -1,9 +0,0 @@
-
-# StringBooleanMap
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderDefault.md

@@ -1,17 +0,0 @@
-
-
-# TypeHolderDefault
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**stringItem** | **String** |  |  |
-|**numberItem** | **BigDecimal** |  |  |
-|**integerItem** | **Integer** |  |  |
-|**boolItem** | **Boolean** |  |  |
-|**arrayItem** | **List<Integer>** |  |  |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderExample.md

@@ -1,18 +0,0 @@
-
-
-# TypeHolderExample
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**stringItem** | **String** |  |  |
-|**numberItem** | **BigDecimal** |  |  |
-|**floatItem** | **Float** |  |  |
-|**integerItem** | **Integer** |  |  |
-|**boolItem** | **Boolean** |  |  |
-|**arrayItem** | **List<Integer>** |  |  |
-
-
-

samples/client/petstore/java/resttemplate-withXml/docs/XmlItem.md

@@ -1,41 +0,0 @@
-
-
-# XmlItem
-
-
-## Properties
-
-| Name | Type | Description | Notes |
-|------------ | ------------- | ------------- | -------------|
-|**attributeString** | **String** |  |  [optional] |
-|**attributeNumber** | **BigDecimal** |  |  [optional] |
-|**attributeInteger** | **Integer** |  |  [optional] |
-|**attributeBoolean** | **Boolean** |  |  [optional] |
-|**wrappedArray** | **List<Integer>** |  |  [optional] |
-|**nameString** | **String** |  |  [optional] |
-|**nameNumber** | **BigDecimal** |  |  [optional] |
-|**nameInteger** | **Integer** |  |  [optional] |
-|**nameBoolean** | **Boolean** |  |  [optional] |
-|**nameArray** | **List<Integer>** |  |  [optional] |
-|**nameWrappedArray** | **List<Integer>** |  |  [optional] |
-|**prefixString** | **String** |  |  [optional] |
-|**prefixNumber** | **BigDecimal** |  |  [optional] |
-|**prefixInteger** | **Integer** |  |  [optional] |
-|**prefixBoolean** | **Boolean** |  |  [optional] |
-|**prefixArray** | **List<Integer>** |  |  [optional] |
-|**prefixWrappedArray** | **List<Integer>** |  |  [optional] |
-|**namespaceString** | **String** |  |  [optional] |
-|**namespaceNumber** | **BigDecimal** |  |  [optional] |
-|**namespaceInteger** | **Integer** |  |  [optional] |
-|**namespaceBoolean** | **Boolean** |  |  [optional] |
-|**namespaceArray** | **List<Integer>** |  |  [optional] |
-|**namespaceWrappedArray** | **List<Integer>** |  |  [optional] |
-|**prefixNsString** | **String** |  |  [optional] |
-|**prefixNsNumber** | **BigDecimal** |  |  [optional] |
-|**prefixNsInteger** | **Integer** |  |  [optional] |
-|**prefixNsBoolean** | **Boolean** |  |  [optional] |
-|**prefixNsArray** | **List<Integer>** |  |  [optional] |
-|**prefixNsWrappedArray** | **List<Integer>** |  |  [optional] |
-
-
-

samples/client/petstore/java/resttemplate-withXml/pom.xml

@@ -69,6 +69,14 @@
                     <forkMode>pertest</forkMode>
                     <useUnlimitedThreads>true</useUnlimitedThreads>
                 </configuration>
+                <dependencies>
+                    <!--Custom provider and engine for Junit 5 to surefire-->
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit-version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -270,11 +278,17 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -283,6 +297,7 @@
         <jackson-databind-version>2.15.2</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
+        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
     </properties>
 </project>

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java

@@ -1,118 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * AdditionalPropertiesAnyType
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "AdditionalPropertiesAnyType")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "AdditionalPropertiesAnyType")
-public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name = "name")
-  private String name;
-
-  public AdditionalPropertiesAnyType() {
-
-  }
-
-  public AdditionalPropertiesAnyType name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-
-  public String getName() {
-    return name;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
-    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesAnyType {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java

@@ -1,119 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * AdditionalPropertiesArray
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesArray.JSON_PROPERTY_NAME
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "AdditionalPropertiesArray")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "AdditionalPropertiesArray")
-public class AdditionalPropertiesArray extends HashMap<String, List> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name = "name")
-  private String name;
-
-  public AdditionalPropertiesArray() {
-
-  }
-
-  public AdditionalPropertiesArray name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-
-  public String getName() {
-    return name;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
-    return Objects.equals(this.name, additionalPropertiesArray.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesArray {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java

@@ -1,118 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * AdditionalPropertiesBoolean
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "AdditionalPropertiesBoolean")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "AdditionalPropertiesBoolean")
-public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name = "name")
-  private String name;
-
-  public AdditionalPropertiesBoolean() {
-
-  }
-
-  public AdditionalPropertiesBoolean name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-
-  public String getName() {
-    return name;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
-    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesBoolean {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java

@@ -1,118 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * AdditionalPropertiesInteger
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesInteger.JSON_PROPERTY_NAME
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "AdditionalPropertiesInteger")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "AdditionalPropertiesInteger")
-public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name = "name")
-  private String name;
-
-  public AdditionalPropertiesInteger() {
-
-  }
-
-  public AdditionalPropertiesInteger name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-
-  public String getName() {
-    return name;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
-    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesInteger {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java

@@ -1,119 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * AdditionalPropertiesNumber
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesNumber.JSON_PROPERTY_NAME
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "AdditionalPropertiesNumber")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "AdditionalPropertiesNumber")
-public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name = "name")
-  private String name;
-
-  public AdditionalPropertiesNumber() {
-
-  }
-
-  public AdditionalPropertiesNumber name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-
-  public String getName() {
-    return name;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
-    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesNumber {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java

@@ -1,118 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * AdditionalPropertiesObject
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesObject.JSON_PROPERTY_NAME
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "AdditionalPropertiesObject")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "AdditionalPropertiesObject")
-public class AdditionalPropertiesObject extends HashMap<String, Map> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name = "name")
-  private String name;
-
-  public AdditionalPropertiesObject() {
-
-  }
-
-  public AdditionalPropertiesObject name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-
-  public String getName() {
-    return name;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
-    return Objects.equals(this.name, additionalPropertiesObject.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesObject {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java

@@ -1,118 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * AdditionalPropertiesString
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesString.JSON_PROPERTY_NAME
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "AdditionalPropertiesString")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "AdditionalPropertiesString")
-public class AdditionalPropertiesString extends HashMap<String, String> {
-  public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name = "name")
-  private String name;
-
-  public AdditionalPropertiesString() {
-
-  }
-
-  public AdditionalPropertiesString name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-
-  public String getName() {
-    return name;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "name")
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
-    return Objects.equals(this.name, additionalPropertiesString.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesString {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/BigCat.java

@@ -1,183 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import org.openapitools.client.model.Cat;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * BigCat
- */
-@JsonPropertyOrder({
-  BigCat.JSON_PROPERTY_KIND
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@JsonIgnoreProperties(
-  value = "className", // ignore manually set className, it will be automatically generated by Jackson during serialization
-  allowSetters = true // allows the className to be set during deserialization
-)
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
-
-@XmlRootElement(name = "BigCat")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "BigCat")
-public class BigCat extends Cat {
-  /**
-   * Gets or Sets kind
-   */
-  @XmlType(name="KindEnum")
-  @XmlEnum(String.class)
-  public enum KindEnum {
-    @XmlEnumValue("lions")
-    LIONS("lions"),
-    
-    @XmlEnumValue("tigers")
-    TIGERS("tigers"),
-    
-    @XmlEnumValue("leopards")
-    LEOPARDS("leopards"),
-    
-    @XmlEnumValue("jaguars")
-    JAGUARS("jaguars");
-
-    private String value;
-
-    KindEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static KindEnum fromValue(String value) {
-      for (KindEnum b : KindEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_KIND = "kind";
-  @XmlElement(name = "kind")
-  private KindEnum kind;
-
-  public BigCat() {
-
-  }
-
-  public BigCat kind(KindEnum kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @javax.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "kind")
-
-  public KindEnum getKind() {
-    return kind;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  @JacksonXmlProperty(localName = "kind")
-  public void setKind(KindEnum kind) {
-    this.kind = kind;
-  }
-
-  @Override
-  public BigCat className(String className) {
-    this.setClassName(className);
-    return this;
-  }
-
-  @Override
-  public BigCat color(String color) {
-    this.setColor(color);
-    return this;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BigCat bigCat = (BigCat) o;
-    return Objects.equals(this.kind, bigCat.kind) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(kind, super.hashCode());
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BigCat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java

@@ -1,270 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * TypeHolderDefault
- */
-@JsonPropertyOrder({
-  TypeHolderDefault.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "TypeHolderDefault")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "TypeHolderDefault")
-public class TypeHolderDefault {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  @XmlElement(name = "string_item")
-  private String stringItem = "what";
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  @XmlElement(name = "number_item")
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  @XmlElement(name = "integer_item")
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  @XmlElement(name = "bool_item")
-  private Boolean boolItem = true;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  // Is a container wrapped=false
-  // items.name=arrayItem items.baseName=arrayItem items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Integer
-  @XmlElement(name = "arrayItem")
-  private List<Integer> arrayItem = new ArrayList<>();
-
-  public TypeHolderDefault() {
-  }
-
-  public TypeHolderDefault stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "string_item")
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "string_item")
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderDefault numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "number_item")
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "number_item")
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderDefault integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "integer_item")
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "integer_item")
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderDefault boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "bool_item")
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "bool_item")
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
-    if (this.arrayItem == null) {
-      this.arrayItem = new ArrayList<>();
-    }
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "array_item")
-  @JacksonXmlElementWrapper(useWrapping = false)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "array_item")
-  @JacksonXmlElementWrapper(useWrapping = false)
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
-    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
-        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderDefault {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java

@@ -1,305 +0,0 @@
-/*
- * OpenAPI Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package org.openapitools.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.dataformat.xml.annotation.*;
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.*;
-import io.github.threetenjaxb.core.*;
-
-/**
- * TypeHolderExample
- */
-@JsonPropertyOrder({
-  TypeHolderExample.JSON_PROPERTY_STRING_ITEM,
-  TypeHolderExample.JSON_PROPERTY_NUMBER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_FLOAT_ITEM,
-  TypeHolderExample.JSON_PROPERTY_INTEGER_ITEM,
-  TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
-  TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
-})
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-@XmlRootElement(name = "TypeHolderExample")
-@XmlAccessorType(XmlAccessType.FIELD)
-@JacksonXmlRootElement(localName = "TypeHolderExample")
-public class TypeHolderExample {
-  public static final String JSON_PROPERTY_STRING_ITEM = "string_item";
-  @XmlElement(name = "string_item")
-  private String stringItem;
-
-  public static final String JSON_PROPERTY_NUMBER_ITEM = "number_item";
-  @XmlElement(name = "number_item")
-  private BigDecimal numberItem;
-
-  public static final String JSON_PROPERTY_FLOAT_ITEM = "float_item";
-  @XmlElement(name = "float_item")
-  private Float floatItem;
-
-  public static final String JSON_PROPERTY_INTEGER_ITEM = "integer_item";
-  @XmlElement(name = "integer_item")
-  private Integer integerItem;
-
-  public static final String JSON_PROPERTY_BOOL_ITEM = "bool_item";
-  @XmlElement(name = "bool_item")
-  private Boolean boolItem;
-
-  public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
-  // Is a container wrapped=false
-  // items.name=arrayItem items.baseName=arrayItem items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Integer
-  @XmlElement(name = "arrayItem")
-  private List<Integer> arrayItem = new ArrayList<>();
-
-  public TypeHolderExample() {
-  }
-
-  public TypeHolderExample stringItem(String stringItem) {
-    
-    this.stringItem = stringItem;
-    return this;
-  }
-
-   /**
-   * Get stringItem
-   * @return stringItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "string_item")
-
-  public String getStringItem() {
-    return stringItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_STRING_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "string_item")
-  public void setStringItem(String stringItem) {
-    this.stringItem = stringItem;
-  }
-
-
-  public TypeHolderExample numberItem(BigDecimal numberItem) {
-    
-    this.numberItem = numberItem;
-    return this;
-  }
-
-   /**
-   * Get numberItem
-   * @return numberItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "number_item")
-
-  public BigDecimal getNumberItem() {
-    return numberItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "number_item")
-  public void setNumberItem(BigDecimal numberItem) {
-    this.numberItem = numberItem;
-  }
-
-
-  public TypeHolderExample floatItem(Float floatItem) {
-    
-    this.floatItem = floatItem;
-    return this;
-  }
-
-   /**
-   * Get floatItem
-   * @return floatItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "float_item")
-
-  public Float getFloatItem() {
-    return floatItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "float_item")
-  public void setFloatItem(Float floatItem) {
-    this.floatItem = floatItem;
-  }
-
-
-  public TypeHolderExample integerItem(Integer integerItem) {
-    
-    this.integerItem = integerItem;
-    return this;
-  }
-
-   /**
-   * Get integerItem
-   * @return integerItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "integer_item")
-
-  public Integer getIntegerItem() {
-    return integerItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "integer_item")
-  public void setIntegerItem(Integer integerItem) {
-    this.integerItem = integerItem;
-  }
-
-
-  public TypeHolderExample boolItem(Boolean boolItem) {
-    
-    this.boolItem = boolItem;
-    return this;
-  }
-
-   /**
-   * Get boolItem
-   * @return boolItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "bool_item")
-
-  public Boolean getBoolItem() {
-    return boolItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "bool_item")
-  public void setBoolItem(Boolean boolItem) {
-    this.boolItem = boolItem;
-  }
-
-
-  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
-    
-    this.arrayItem = arrayItem;
-    return this;
-  }
-
-  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
-    if (this.arrayItem == null) {
-      this.arrayItem = new ArrayList<>();
-    }
-    this.arrayItem.add(arrayItemItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItem
-   * @return arrayItem
-  **/
-  @javax.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "array_item")
-  @JacksonXmlElementWrapper(useWrapping = false)
-
-  public List<Integer> getArrayItem() {
-    return arrayItem;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  @JacksonXmlProperty(localName = "array_item")
-  @JacksonXmlElementWrapper(useWrapping = false)
-  public void setArrayItem(List<Integer> arrayItem) {
-    this.arrayItem = arrayItem;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
-    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
-        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
-        Objects.equals(this.floatItem, typeHolderExample.floatItem) &&
-        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
-        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
-        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TypeHolderExample {\n");
-    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
-    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
-    sb.append("    floatItem: ").append(toIndentedString(floatItem)).append("\n");
-    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
-    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
-    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Client;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for AnotherFakeApi
  */
-@Ignore
+@Disabled
-public class AnotherFakeApiTest {
+class AnotherFakeApiTest {
 
     private final AnotherFakeApi api = new AnotherFakeApi();
 
@@ -38,12 +39,13 @@ public class AnotherFakeApiTest {
      *
      * To test special tags and operation ID starting with number
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void call123testSpecialTagsTest() {
+    void call123testSpecialTagsTest() {
         Client client = null;
+
         Client response = api.call123testSpecialTags(client);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/DefaultApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.FooGetDefaultResponse;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for DefaultApi
  */
-@Ignore
+@Disabled
-public class DefaultApiTest {
+class DefaultApiTest {
 
     private final DefaultApi api = new DefaultApi();
 
@@ -38,11 +39,12 @@ public class DefaultApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fooGetTest() {
+    void fooGetTest() {
+
         FooGetDefaultResponse response = api.fooGet();
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/FakeApiTest.java

@@ -14,6 +14,7 @@
 package org.openapitools.client.api;
 
 import java.math.BigDecimal;
+import org.openapitools.client.model.ChildWithNullable;
 import org.openapitools.client.model.Client;
 import org.openapitools.client.model.EnumClass;
 import org.openapitools.client.model.FakeBigDecimalMap200Response;
@@ -25,9 +26,11 @@ import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.OuterObjectWithEnumProperty;
 import org.openapitools.client.model.Pet;
+import org.openapitools.client.model.TestInlineFreeformAdditionalPropertiesRequest;
 import org.openapitools.client.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -39,8 +42,8 @@ import java.util.Map;
 /**
  * API tests for FakeApi
  */
-@Ignore
+@Disabled
-public class FakeApiTest {
+class FakeApiTest {
 
     private final FakeApi api = new FakeApi();
 
@@ -50,11 +53,12 @@ public class FakeApiTest {
      *
      * for Java apache and Java native, test toUrlQueryString for maps with BegDecimal keys
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakeBigDecimalMapTest() {
+    void fakeBigDecimalMapTest() {
+
         FakeBigDecimalMap200Response response = api.fakeBigDecimalMap();
 
         // TODO: test validations
@@ -65,11 +69,12 @@ public class FakeApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakeHealthGetTest() {
+    void fakeHealthGetTest() {
+
         HealthCheckResult response = api.fakeHealthGet();
 
         // TODO: test validations
@@ -80,14 +85,15 @@ public class FakeApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakeHttpSignatureTestTest() {
+    void fakeHttpSignatureTestTest() {
         Pet pet = null;
         String query1 = null;
         String header1 = null;
+
         api.fakeHttpSignatureTest(pet, query1, header1);
 
         // TODO: test validations
@@ -98,12 +104,13 @@ public class FakeApiTest {
      *
      * Test serialization of outer boolean types
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakeOuterBooleanSerializeTest() {
+    void fakeOuterBooleanSerializeTest() {
         Boolean body = null;
+
         Boolean response = api.fakeOuterBooleanSerialize(body);
 
         // TODO: test validations
@@ -114,12 +121,13 @@ public class FakeApiTest {
      *
      * Test serialization of object with outer number type
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakeOuterCompositeSerializeTest() {
+    void fakeOuterCompositeSerializeTest() {
         OuterComposite outerComposite = null;
+
         OuterComposite response = api.fakeOuterCompositeSerialize(outerComposite);
 
         // TODO: test validations
@@ -130,12 +138,13 @@ public class FakeApiTest {
      *
      * Test serialization of outer number types
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakeOuterNumberSerializeTest() {
+    void fakeOuterNumberSerializeTest() {
         BigDecimal body = null;
+
         BigDecimal response = api.fakeOuterNumberSerialize(body);
 
         // TODO: test validations
@@ -146,12 +155,13 @@ public class FakeApiTest {
      *
      * Test serialization of outer string types
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakeOuterStringSerializeTest() {
+    void fakeOuterStringSerializeTest() {
         String body = null;
+
         String response = api.fakeOuterStringSerialize(body);
 
         // TODO: test validations
@@ -162,28 +172,47 @@ public class FakeApiTest {
      *
      * Test serialization of enum (int) properties with examples
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void fakePropertyEnumIntegerSerializeTest() {
+    void fakePropertyEnumIntegerSerializeTest() {
         OuterObjectWithEnumProperty outerObjectWithEnumProperty = null;
+
         OuterObjectWithEnumProperty response = api.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty);
 
         // TODO: test validations
     }
     
+    /**
+     * test referenced additionalProperties
+     *
+     * 
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testAdditionalPropertiesReferenceTest() {
+        Map<String, Object> requestBody = null;
+
+        api.testAdditionalPropertiesReference(requestBody);
+
+        // TODO: test validations
+    }
+    
     /**
      * 
      *
      * For this test, the body has to be a binary file.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testBodyWithBinaryTest() {
+    void testBodyWithBinaryTest() {
         File body = null;
+
         api.testBodyWithBinary(body);
 
         // TODO: test validations
@@ -194,12 +223,13 @@ public class FakeApiTest {
      *
      * For this test, the body for this request must reference a schema named &#x60;File&#x60;.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testBodyWithFileSchemaTest() {
+    void testBodyWithFileSchemaTest() {
         FileSchemaTestClass fileSchemaTestClass = null;
+
         api.testBodyWithFileSchema(fileSchemaTestClass);
 
         // TODO: test validations
@@ -210,13 +240,14 @@ public class FakeApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testBodyWithQueryParamsTest() {
+    void testBodyWithQueryParamsTest() {
         String query = null;
         User user = null;
+
         api.testBodyWithQueryParams(query, user);
 
         // TODO: test validations
@@ -227,12 +258,13 @@ public class FakeApiTest {
      *
      * To test \&quot;client\&quot; model
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testClientModelTest() {
+    void testClientModelTest() {
         Client client = null;
+
         Client response = api.testClientModel(client);
 
         // TODO: test validations
@@ -243,11 +275,11 @@ public class FakeApiTest {
      *
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEndpointParametersTest() {
+    void testEndpointParametersTest() {
         BigDecimal number = null;
         Double _double = null;
         String patternWithoutDelimiter = null;
@@ -262,6 +294,7 @@ public class FakeApiTest {
         OffsetDateTime dateTime = null;
         String password = null;
         String paramCallback = null;
+
         api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
 
         // TODO: test validations
@@ -272,11 +305,11 @@ public class FakeApiTest {
      *
      * To test enum parameters
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testEnumParametersTest() {
+    void testEnumParametersTest() {
         List<String> enumHeaderStringArray = null;
         String enumHeaderString = null;
         List<String> enumQueryStringArray = null;
@@ -286,6 +319,7 @@ public class FakeApiTest {
         List<EnumClass> enumQueryModelArray = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
+
         api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
 
         // TODO: test validations
@@ -296,17 +330,18 @@ public class FakeApiTest {
      *
      * Fake endpoint to test group parameters (optional)
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testGroupParametersTest() {
+    void testGroupParametersTest() {
         Integer requiredStringGroup = null;
         Boolean requiredBooleanGroup = null;
         Long requiredInt64Group = null;
         Integer stringGroup = null;
         Boolean booleanGroup = null;
         Long int64Group = null;
+
         api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
         // TODO: test validations
@@ -317,44 +352,80 @@ public class FakeApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testInlineAdditionalPropertiesTest() {
+    void testInlineAdditionalPropertiesTest() {
         Map<String, String> requestBody = null;
+
         api.testInlineAdditionalProperties(requestBody);
 
         // TODO: test validations
     }
     
+    /**
+     * test inline free-form additionalProperties
+     *
+     * 
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testInlineFreeformAdditionalPropertiesTest() {
+        TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditionalPropertiesRequest = null;
+
+        api.testInlineFreeformAdditionalProperties(testInlineFreeformAdditionalPropertiesRequest);
+
+        // TODO: test validations
+    }
+    
     /**
      * test json serialization of form data
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testJsonFormDataTest() {
+    void testJsonFormDataTest() {
         String param = null;
         String param2 = null;
+
         api.testJsonFormData(param, param2);
 
         // TODO: test validations
     }
     
+    /**
+     * test nullable parent property
+     *
+     * 
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testNullableTest() {
+        ChildWithNullable childWithNullable = null;
+
+        api.testNullable(childWithNullable);
+
+        // TODO: test validations
+    }
+    
     /**
      * 
      *
      * To test the collection format in query parameters
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testQueryParameterCollectionFormatTest() {
+    void testQueryParameterCollectionFormatTest() {
         List<String> pipe = null;
         List<String> ioutil = null;
         List<String> http = null;
@@ -362,9 +433,27 @@ public class FakeApiTest {
         List<String> context = null;
         String allowEmpty = null;
         Map<String, String> language = null;
+
         api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, allowEmpty, language);
 
         // TODO: test validations
     }
     
+    /**
+     * test referenced string map
+     *
+     * 
+     *
+     * @throws RestClientException
+     *          if the Api call fails
+     */
+    @Test
+    void testStringMapReferenceTest() {
+        Map<String, String> requestBody = null;
+
+        api.testStringMapReference(requestBody);
+
+        // TODO: test validations
+    }
+    
 }

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Client;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for FakeClassnameTags123Api
  */
-@Ignore
+@Disabled
-public class FakeClassnameTags123ApiTest {
+class FakeClassnameTags123ApiTest {
 
     private final FakeClassnameTags123Api api = new FakeClassnameTags123Api();
 
@@ -38,12 +39,13 @@ public class FakeClassnameTags123ApiTest {
      *
      * To test class name in snake case
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void testClassnameTest() {
+    void testClassnameTest() {
         Client client = null;
+
         Client response = api.testClassname(client);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/PetApiTest.java

@@ -17,8 +17,9 @@ import java.io.File;
 import org.openapitools.client.model.ModelApiResponse;
 import org.openapitools.client.model.Pet;
 import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -30,8 +31,8 @@ import java.util.Map;
 /**
  * API tests for PetApi
  */
-@Ignore
+@Disabled
-public class PetApiTest {
+class PetApiTest {
 
     private final PetApi api = new PetApi();
 
@@ -41,12 +42,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void addPetTest() {
+    void addPetTest() {
         Pet pet = null;
+
         api.addPet(pet);
 
         // TODO: test validations
@@ -57,13 +59,14 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deletePetTest() {
+    void deletePetTest() {
         Long petId = null;
         String apiKey = null;
+
         api.deletePet(petId, apiKey);
 
         // TODO: test validations
@@ -74,12 +77,13 @@ public class PetApiTest {
      *
      * Multiple status values can be provided with comma separated strings
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByStatusTest() {
+    void findPetsByStatusTest() {
         List<String> status = null;
+
         List<Pet> response = api.findPetsByStatus(status);
 
         // TODO: test validations
@@ -90,12 +94,13 @@ public class PetApiTest {
      *
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void findPetsByTagsTest() {
+    void findPetsByTagsTest() {
         Set<String> tags = null;
+
         Set<Pet> response = api.findPetsByTags(tags);
 
         // TODO: test validations
@@ -106,12 +111,13 @@ public class PetApiTest {
      *
      * Returns a single pet
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getPetByIdTest() {
+    void getPetByIdTest() {
         Long petId = null;
+
         Pet response = api.getPetById(petId);
 
         // TODO: test validations
@@ -122,12 +128,13 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetTest() {
+    void updatePetTest() {
         Pet pet = null;
+
         api.updatePet(pet);
 
         // TODO: test validations
@@ -138,14 +145,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updatePetWithFormTest() {
+    void updatePetWithFormTest() {
         Long petId = null;
         String name = null;
         String status = null;
+
         api.updatePetWithForm(petId, name, status);
 
         // TODO: test validations
@@ -156,14 +164,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void uploadFileTest() {
+    void uploadFileTest() {
         Long petId = null;
         String additionalMetadata = null;
         File _file = null;
+
         ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
 
         // TODO: test validations
@@ -174,14 +183,15 @@ public class PetApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void uploadFileWithRequiredFileTest() {
+    void uploadFileWithRequiredFileTest() {
         Long petId = null;
         File requiredFile = null;
         String additionalMetadata = null;
+
         ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/StoreApiTest.java

@@ -14,8 +14,9 @@
 package org.openapitools.client.api;
 
 import org.openapitools.client.model.Order;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -27,8 +28,8 @@ import java.util.Map;
 /**
  * API tests for StoreApi
  */
-@Ignore
+@Disabled
-public class StoreApiTest {
+class StoreApiTest {
 
     private final StoreApi api = new StoreApi();
 
@@ -38,12 +39,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteOrderTest() {
+    void deleteOrderTest() {
         String orderId = null;
+
         api.deleteOrder(orderId);
 
         // TODO: test validations
@@ -54,11 +56,12 @@ public class StoreApiTest {
      *
      * Returns a map of status codes to quantities
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getInventoryTest() {
+    void getInventoryTest() {
+
         Map<String, Integer> response = api.getInventory();
 
         // TODO: test validations
@@ -69,12 +72,13 @@ public class StoreApiTest {
      *
      * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generate exceptions
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getOrderByIdTest() {
+    void getOrderByIdTest() {
         Long orderId = null;
+
         Order response = api.getOrderById(orderId);
 
         // TODO: test validations
@@ -85,12 +89,13 @@ public class StoreApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void placeOrderTest() {
+    void placeOrderTest() {
         Order order = null;
+
         Order response = api.placeOrder(order);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/api/UserApiTest.java

@@ -15,8 +15,9 @@ package org.openapitools.client.api;
 
 import java.time.OffsetDateTime;
 import org.openapitools.client.model.User;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.client.RestClientException;
 
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -28,8 +29,8 @@ import java.util.Map;
 /**
  * API tests for UserApi
  */
-@Ignore
+@Disabled
-public class UserApiTest {
+class UserApiTest {
 
     private final UserApi api = new UserApi();
 
@@ -39,12 +40,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUserTest() {
+    void createUserTest() {
         User user = null;
+
         api.createUser(user);
 
         // TODO: test validations
@@ -55,12 +57,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithArrayInputTest() {
+    void createUsersWithArrayInputTest() {
         List<User> user = null;
+
         api.createUsersWithArrayInput(user);
 
         // TODO: test validations
@@ -71,12 +74,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void createUsersWithListInputTest() {
+    void createUsersWithListInputTest() {
         List<User> user = null;
+
         api.createUsersWithListInput(user);
 
         // TODO: test validations
@@ -87,12 +91,13 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void deleteUserTest() {
+    void deleteUserTest() {
         String username = null;
+
         api.deleteUser(username);
 
         // TODO: test validations
@@ -103,12 +108,13 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void getUserByNameTest() {
+    void getUserByNameTest() {
         String username = null;
+
         User response = api.getUserByName(username);
 
         // TODO: test validations
@@ -119,13 +125,14 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void loginUserTest() {
+    void loginUserTest() {
         String username = null;
         String password = null;
+
         String response = api.loginUser(username, password);
 
         // TODO: test validations
@@ -136,11 +143,12 @@ public class UserApiTest {
      *
      * 
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void logoutUserTest() {
+    void logoutUserTest() {
+
         api.logoutUser();
 
         // TODO: test validations
@@ -151,13 +159,14 @@ public class UserApiTest {
      *
      * This can only be done by the logged in user.
      *
-     * @throws ApiException
+     * @throws RestClientException
      *          if the Api call fails
      */
     @Test
-    public void updateUserTest() {
+    void updateUserTest() {
         String username = null;
         User user = null;
+
         api.updateUser(username, user);
 
         // TODO: test validations

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java

@@ -20,21 +20,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for AdditionalPropertiesClass
  */
-public class AdditionalPropertiesClassTest {
+class AdditionalPropertiesClassTest {
     private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
 
     /**
      * Model tests for AdditionalPropertiesClass
      */
     @Test
-    public void testAdditionalPropertiesClass() {
+    void testAdditionalPropertiesClass() {
         // TODO: test AdditionalPropertiesClass
     }
 
@@ -42,7 +42,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapProperty'
      */
     @Test
-    public void mapPropertyTest() {
+    void mapPropertyTest() {
         // TODO: test mapProperty
     }
 
@@ -50,7 +50,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapOfMapProperty'
      */
     @Test
-    public void mapOfMapPropertyTest() {
+    void mapOfMapPropertyTest() {
         // TODO: test mapOfMapProperty
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/AllOfWithSingleRefTest.java

@@ -19,21 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.SingleRefType;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for AllOfWithSingleRef
  */
-public class AllOfWithSingleRefTest {
+class AllOfWithSingleRefTest {
     private final AllOfWithSingleRef model = new AllOfWithSingleRef();
 
     /**
      * Model tests for AllOfWithSingleRef
      */
     @Test
-    public void testAllOfWithSingleRef() {
+    void testAllOfWithSingleRef() {
         // TODO: test AllOfWithSingleRef
     }
 
@@ -41,7 +41,7 @@ public class AllOfWithSingleRefTest {
      * Test the property 'username'
      */
     @Test
-    public void usernameTest() {
+    void usernameTest() {
         // TODO: test username
     }
 
@@ -49,7 +49,7 @@ public class AllOfWithSingleRefTest {
      * Test the property 'singleRefType'
      */
     @Test
-    public void singleRefTypeTest() {
+    void singleRefTypeTest() {
         // TODO: test singleRefType
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/AnimalTest.java

@@ -21,21 +21,21 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Animal
  */
-public class AnimalTest {
+class AnimalTest {
     private final Animal model = new Animal();
 
     /**
      * Model tests for Animal
      */
     @Test
-    public void testAnimal() {
+    void testAnimal() {
         // TODO: test Animal
     }
 
@@ -43,7 +43,7 @@ public class AnimalTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -51,7 +51,7 @@ public class AnimalTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java

@@ -22,21 +22,21 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for ArrayOfArrayOfNumberOnly
  */
-public class ArrayOfArrayOfNumberOnlyTest {
+class ArrayOfArrayOfNumberOnlyTest {
     private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
 
     /**
      * Model tests for ArrayOfArrayOfNumberOnly
      */
     @Test
-    public void testArrayOfArrayOfNumberOnly() {
+    void testArrayOfArrayOfNumberOnly() {
         // TODO: test ArrayOfArrayOfNumberOnly
     }
 
@@ -44,7 +44,7 @@ public class ArrayOfArrayOfNumberOnlyTest {
      * Test the property 'arrayArrayNumber'
      */
     @Test
-    public void arrayArrayNumberTest() {
+    void arrayArrayNumberTest() {
         // TODO: test arrayArrayNumber
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java

@@ -22,21 +22,21 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for ArrayOfNumberOnly
  */
-public class ArrayOfNumberOnlyTest {
+class ArrayOfNumberOnlyTest {
     private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
 
     /**
      * Model tests for ArrayOfNumberOnly
      */
     @Test
-    public void testArrayOfNumberOnly() {
+    void testArrayOfNumberOnly() {
         // TODO: test ArrayOfNumberOnly
     }
 
@@ -44,7 +44,7 @@ public class ArrayOfNumberOnlyTest {
      * Test the property 'arrayNumber'
      */
     @Test
-    public void arrayNumberTest() {
+    void arrayNumberTest() {
         // TODO: test arrayNumber
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/ArrayTestTest.java

@@ -22,21 +22,21 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ReadOnlyFirst;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for ArrayTest
  */
-public class ArrayTestTest {
+class ArrayTestTest {
     private final ArrayTest model = new ArrayTest();
 
     /**
      * Model tests for ArrayTest
      */
     @Test
-    public void testArrayTest() {
+    void testArrayTest() {
         // TODO: test ArrayTest
     }
 
@@ -44,7 +44,7 @@ public class ArrayTestTest {
      * Test the property 'arrayOfString'
      */
     @Test
-    public void arrayOfStringTest() {
+    void arrayOfStringTest() {
         // TODO: test arrayOfString
     }
 
@@ -52,7 +52,7 @@ public class ArrayTestTest {
      * Test the property 'arrayArrayOfInteger'
      */
     @Test
-    public void arrayArrayOfIntegerTest() {
+    void arrayArrayOfIntegerTest() {
         // TODO: test arrayArrayOfInteger
     }
 
@@ -60,7 +60,7 @@ public class ArrayTestTest {
      * Test the property 'arrayArrayOfModel'
      */
     @Test
-    public void arrayArrayOfModelTest() {
+    void arrayArrayOfModelTest() {
         // TODO: test arrayArrayOfModel
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/CapitalizationTest.java

@@ -18,21 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Capitalization
  */
-public class CapitalizationTest {
+class CapitalizationTest {
     private final Capitalization model = new Capitalization();
 
     /**
      * Model tests for Capitalization
      */
     @Test
-    public void testCapitalization() {
+    void testCapitalization() {
         // TODO: test Capitalization
     }
 
@@ -40,7 +40,7 @@ public class CapitalizationTest {
      * Test the property 'smallCamel'
      */
     @Test
-    public void smallCamelTest() {
+    void smallCamelTest() {
         // TODO: test smallCamel
     }
 
@@ -48,7 +48,7 @@ public class CapitalizationTest {
      * Test the property 'capitalCamel'
      */
     @Test
-    public void capitalCamelTest() {
+    void capitalCamelTest() {
         // TODO: test capitalCamel
     }
 
@@ -56,7 +56,7 @@ public class CapitalizationTest {
      * Test the property 'smallSnake'
      */
     @Test
-    public void smallSnakeTest() {
+    void smallSnakeTest() {
         // TODO: test smallSnake
     }
 
@@ -64,7 +64,7 @@ public class CapitalizationTest {
      * Test the property 'capitalSnake'
      */
     @Test
-    public void capitalSnakeTest() {
+    void capitalSnakeTest() {
         // TODO: test capitalSnake
     }
 
@@ -72,7 +72,7 @@ public class CapitalizationTest {
      * Test the property 'scAETHFlowPoints'
      */
     @Test
-    public void scAETHFlowPointsTest() {
+    void scAETHFlowPointsTest() {
         // TODO: test scAETHFlowPoints
     }
 
@@ -80,7 +80,7 @@ public class CapitalizationTest {
      * Test the property 'ATT_NAME'
      */
     @Test
-    public void ATT_NAMETest() {
+    void ATT_NAMETest() {
         // TODO: test ATT_NAME
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/CatTest.java

@@ -22,21 +22,21 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Animal;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Cat
  */
-public class CatTest {
+class CatTest {
     private final Cat model = new Cat();
 
     /**
      * Model tests for Cat
      */
     @Test
-    public void testCat() {
+    void testCat() {
         // TODO: test Cat
     }
 
@@ -44,7 +44,7 @@ public class CatTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -52,7 +52,7 @@ public class CatTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -60,7 +60,7 @@ public class CatTest {
      * Test the property 'declawed'
      */
     @Test
-    public void declawedTest() {
+    void declawedTest() {
         // TODO: test declawed
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/CategoryTest.java

@@ -18,21 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Category
  */
-public class CategoryTest {
+class CategoryTest {
     private final Category model = new Category();
 
     /**
      * Model tests for Category
      */
     @Test
-    public void testCategory() {
+    void testCategory() {
         // TODO: test Category
     }
 
@@ -40,7 +40,7 @@ public class CategoryTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -48,7 +48,7 @@ public class CategoryTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/ChildWithNullableTest.java

@@ -23,21 +23,21 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.ParentWithNullable;
 import org.openapitools.jackson.nullable.JsonNullable;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for ChildWithNullable
  */
-public class ChildWithNullableTest {
+class ChildWithNullableTest {
     private final ChildWithNullable model = new ChildWithNullable();
 
     /**
      * Model tests for ChildWithNullable
      */
     @Test
-    public void testChildWithNullable() {
+    void testChildWithNullable() {
         // TODO: test ChildWithNullable
     }
 
@@ -45,7 +45,7 @@ public class ChildWithNullableTest {
      * Test the property 'type'
      */
     @Test
-    public void typeTest() {
+    void typeTest() {
         // TODO: test type
     }
 
@@ -53,7 +53,7 @@ public class ChildWithNullableTest {
      * Test the property 'nullableProperty'
      */
     @Test
-    public void nullablePropertyTest() {
+    void nullablePropertyTest() {
         // TODO: test nullableProperty
     }
 
@@ -61,7 +61,7 @@ public class ChildWithNullableTest {
      * Test the property 'otherProperty'
      */
     @Test
-    public void otherPropertyTest() {
+    void otherPropertyTest() {
         // TODO: test otherProperty
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/ClassModelTest.java

@@ -18,21 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for ClassModel
  */
-public class ClassModelTest {
+class ClassModelTest {
     private final ClassModel model = new ClassModel();
 
     /**
      * Model tests for ClassModel
      */
     @Test
-    public void testClassModel() {
+    void testClassModel() {
         // TODO: test ClassModel
     }
 
@@ -40,7 +40,7 @@ public class ClassModelTest {
      * Test the property 'propertyClass'
      */
     @Test
-    public void propertyClassTest() {
+    void propertyClassTest() {
         // TODO: test propertyClass
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/ClientTest.java

@@ -18,21 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Client
  */
-public class ClientTest {
+class ClientTest {
     private final Client model = new Client();
 
     /**
      * Model tests for Client
      */
     @Test
-    public void testClient() {
+    void testClient() {
         // TODO: test Client
     }
 
@@ -40,7 +40,7 @@ public class ClientTest {
      * Test the property 'client'
      */
     @Test
-    public void clientTest() {
+    void clientTest() {
         // TODO: test client
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/DeprecatedObjectTest.java

@@ -18,21 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for DeprecatedObject
  */
-public class DeprecatedObjectTest {
+class DeprecatedObjectTest {
     private final DeprecatedObject model = new DeprecatedObject();
 
     /**
      * Model tests for DeprecatedObject
      */
     @Test
-    public void testDeprecatedObject() {
+    void testDeprecatedObject() {
         // TODO: test DeprecatedObject
     }
 
@@ -40,7 +40,7 @@ public class DeprecatedObjectTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/DogTest.java

@@ -22,21 +22,21 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Animal;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Dog
  */
-public class DogTest {
+class DogTest {
     private final Dog model = new Dog();
 
     /**
      * Model tests for Dog
      */
     @Test
-    public void testDog() {
+    void testDog() {
         // TODO: test Dog
     }
 
@@ -44,7 +44,7 @@ public class DogTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -52,7 +52,7 @@ public class DogTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -60,7 +60,7 @@ public class DogTest {
      * Test the property 'breed'
      */
     @Test
-    public void breedTest() {
+    void breedTest() {
         // TODO: test breed
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/EnumArraysTest.java

@@ -21,21 +21,21 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for EnumArrays
  */
-public class EnumArraysTest {
+class EnumArraysTest {
     private final EnumArrays model = new EnumArrays();
 
     /**
      * Model tests for EnumArrays
      */
     @Test
-    public void testEnumArrays() {
+    void testEnumArrays() {
         // TODO: test EnumArrays
     }
 
@@ -43,7 +43,7 @@ public class EnumArraysTest {
      * Test the property 'justSymbol'
      */
     @Test
-    public void justSymbolTest() {
+    void justSymbolTest() {
         // TODO: test justSymbol
     }
 
@@ -51,7 +51,7 @@ public class EnumArraysTest {
      * Test the property 'arrayEnum'
      */
     @Test
-    public void arrayEnumTest() {
+    void arrayEnumTest() {
         // TODO: test arrayEnum
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/EnumClassTest.java

@@ -13,19 +13,19 @@
 
 package org.openapitools.client.model;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for EnumClass
  */
-public class EnumClassTest {
+class EnumClassTest {
     /**
      * Model tests for EnumClass
      */
     @Test
-    public void testEnumClass() {
+    void testEnumClass() {
         // TODO: test EnumClass
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/EnumTestTest.java

@@ -26,21 +26,21 @@ import org.openapitools.jackson.nullable.JsonNullable;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.openapitools.jackson.nullable.JsonNullable;
 import java.util.NoSuchElementException;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for EnumTest
  */
-public class EnumTestTest {
+class EnumTestTest {
     private final EnumTest model = new EnumTest();
 
     /**
      * Model tests for EnumTest
      */
     @Test
-    public void testEnumTest() {
+    void testEnumTest() {
         // TODO: test EnumTest
     }
 
@@ -48,7 +48,7 @@ public class EnumTestTest {
      * Test the property 'enumString'
      */
     @Test
-    public void enumStringTest() {
+    void enumStringTest() {
         // TODO: test enumString
     }
 
@@ -56,7 +56,7 @@ public class EnumTestTest {
      * Test the property 'enumStringRequired'
      */
     @Test
-    public void enumStringRequiredTest() {
+    void enumStringRequiredTest() {
         // TODO: test enumStringRequired
     }
 
@@ -64,7 +64,7 @@ public class EnumTestTest {
      * Test the property 'enumInteger'
      */
     @Test
-    public void enumIntegerTest() {
+    void enumIntegerTest() {
         // TODO: test enumInteger
     }
 
@@ -72,7 +72,7 @@ public class EnumTestTest {
      * Test the property 'enumNumber'
      */
     @Test
-    public void enumNumberTest() {
+    void enumNumberTest() {
         // TODO: test enumNumber
     }
 
@@ -80,7 +80,7 @@ public class EnumTestTest {
      * Test the property 'outerEnum'
      */
     @Test
-    public void outerEnumTest() {
+    void outerEnumTest() {
         // TODO: test outerEnum
     }
 
@@ -88,7 +88,7 @@ public class EnumTestTest {
      * Test the property 'outerEnumInteger'
      */
     @Test
-    public void outerEnumIntegerTest() {
+    void outerEnumIntegerTest() {
         // TODO: test outerEnumInteger
     }
 
@@ -96,7 +96,7 @@ public class EnumTestTest {
      * Test the property 'outerEnumDefaultValue'
      */
     @Test
-    public void outerEnumDefaultValueTest() {
+    void outerEnumDefaultValueTest() {
         // TODO: test outerEnumDefaultValue
     }
 
@@ -104,7 +104,7 @@ public class EnumTestTest {
      * Test the property 'outerEnumIntegerDefaultValue'
      */
     @Test
-    public void outerEnumIntegerDefaultValueTest() {
+    void outerEnumIntegerDefaultValueTest() {
         // TODO: test outerEnumIntegerDefaultValue
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/FakeBigDecimalMap200ResponseTest.java

@@ -21,21 +21,21 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for FakeBigDecimalMap200Response
  */
-public class FakeBigDecimalMap200ResponseTest {
+class FakeBigDecimalMap200ResponseTest {
     private final FakeBigDecimalMap200Response model = new FakeBigDecimalMap200Response();
 
     /**
      * Model tests for FakeBigDecimalMap200Response
      */
     @Test
-    public void testFakeBigDecimalMap200Response() {
+    void testFakeBigDecimalMap200Response() {
         // TODO: test FakeBigDecimalMap200Response
     }
 
@@ -43,7 +43,7 @@ public class FakeBigDecimalMap200ResponseTest {
      * Test the property 'someId'
      */
     @Test
-    public void someIdTest() {
+    void someIdTest() {
         // TODO: test someId
     }
 
@@ -51,7 +51,7 @@ public class FakeBigDecimalMap200ResponseTest {
      * Test the property 'someMap'
      */
     @Test
-    public void someMapTest() {
+    void someMapTest() {
         // TODO: test someMap
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java

@@ -22,21 +22,21 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.openapitools.client.model.ModelFile;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for FileSchemaTestClass
  */
-public class FileSchemaTestClassTest {
+class FileSchemaTestClassTest {
     private final FileSchemaTestClass model = new FileSchemaTestClass();
 
     /**
      * Model tests for FileSchemaTestClass
      */
     @Test
-    public void testFileSchemaTestClass() {
+    void testFileSchemaTestClass() {
         // TODO: test FileSchemaTestClass
     }
 
@@ -44,7 +44,7 @@ public class FileSchemaTestClassTest {
      * Test the property '_file'
      */
     @Test
-    public void _fileTest() {
+    void _fileTest() {
         // TODO: test _file
     }
 
@@ -52,7 +52,7 @@ public class FileSchemaTestClassTest {
      * Test the property 'files'
      */
     @Test
-    public void filesTest() {
+    void filesTest() {
         // TODO: test files
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/FooGetDefaultResponseTest.java

@@ -19,21 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import org.openapitools.client.model.Foo;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for FooGetDefaultResponse
  */
-public class FooGetDefaultResponseTest {
+class FooGetDefaultResponseTest {
     private final FooGetDefaultResponse model = new FooGetDefaultResponse();
 
     /**
      * Model tests for FooGetDefaultResponse
      */
     @Test
-    public void testFooGetDefaultResponse() {
+    void testFooGetDefaultResponse() {
         // TODO: test FooGetDefaultResponse
     }
 
@@ -41,7 +41,7 @@ public class FooGetDefaultResponseTest {
      * Test the property 'string'
      */
     @Test
-    public void stringTest() {
+    void stringTest() {
         // TODO: test string
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/FooTest.java

@@ -18,21 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for Foo
  */
-public class FooTest {
+class FooTest {
     private final Foo model = new Foo();
 
     /**
      * Model tests for Foo
      */
     @Test
-    public void testFoo() {
+    void testFoo() {
         // TODO: test Foo
     }
 
@@ -40,7 +40,7 @@ public class FooTest {
      * Test the property 'bar'
      */
     @Test
-    public void barTest() {
+    void barTest() {
         // TODO: test bar
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/FormatTestTest.java

@@ -23,21 +23,21 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 import java.util.UUID;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for FormatTest
  */
-public class FormatTestTest {
+class FormatTestTest {
     private final FormatTest model = new FormatTest();
 
     /**
      * Model tests for FormatTest
      */
     @Test
-    public void testFormatTest() {
+    void testFormatTest() {
         // TODO: test FormatTest
     }
 
@@ -45,7 +45,7 @@ public class FormatTestTest {
      * Test the property 'integer'
      */
     @Test
-    public void integerTest() {
+    void integerTest() {
         // TODO: test integer
     }
 
@@ -53,7 +53,7 @@ public class FormatTestTest {
      * Test the property 'int32'
      */
     @Test
-    public void int32Test() {
+    void int32Test() {
         // TODO: test int32
     }
 
@@ -61,7 +61,7 @@ public class FormatTestTest {
      * Test the property 'int64'
      */
     @Test
-    public void int64Test() {
+    void int64Test() {
         // TODO: test int64
     }
 
@@ -69,7 +69,7 @@ public class FormatTestTest {
      * Test the property 'number'
      */
     @Test
-    public void numberTest() {
+    void numberTest() {
         // TODO: test number
     }
 
@@ -77,7 +77,7 @@ public class FormatTestTest {
      * Test the property '_float'
      */
     @Test
-    public void _floatTest() {
+    void _floatTest() {
         // TODO: test _float
     }
 
@@ -85,7 +85,7 @@ public class FormatTestTest {
      * Test the property '_double'
      */
     @Test
-    public void _doubleTest() {
+    void _doubleTest() {
         // TODO: test _double
     }
 
@@ -93,7 +93,7 @@ public class FormatTestTest {
      * Test the property 'decimal'
      */
     @Test
-    public void decimalTest() {
+    void decimalTest() {
         // TODO: test decimal
     }
 
@@ -101,7 +101,7 @@ public class FormatTestTest {
      * Test the property 'string'
      */
     @Test
-    public void stringTest() {
+    void stringTest() {
         // TODO: test string
     }
 
@@ -109,7 +109,7 @@ public class FormatTestTest {
      * Test the property '_byte'
      */
     @Test
-    public void _byteTest() {
+    void _byteTest() {
         // TODO: test _byte
     }
 
@@ -117,7 +117,7 @@ public class FormatTestTest {
      * Test the property 'binary'
      */
     @Test
-    public void binaryTest() {
+    void binaryTest() {
         // TODO: test binary
     }
 
@@ -125,7 +125,7 @@ public class FormatTestTest {
      * Test the property 'date'
      */
     @Test
-    public void dateTest() {
+    void dateTest() {
         // TODO: test date
     }
 
@@ -133,7 +133,7 @@ public class FormatTestTest {
      * Test the property 'dateTime'
      */
     @Test
-    public void dateTimeTest() {
+    void dateTimeTest() {
         // TODO: test dateTime
     }
 
@@ -141,7 +141,7 @@ public class FormatTestTest {
      * Test the property 'uuid'
      */
     @Test
-    public void uuidTest() {
+    void uuidTest() {
         // TODO: test uuid
     }
 
@@ -149,7 +149,7 @@ public class FormatTestTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -157,7 +157,7 @@ public class FormatTestTest {
      * Test the property 'patternWithDigits'
      */
     @Test
-    public void patternWithDigitsTest() {
+    void patternWithDigitsTest() {
         // TODO: test patternWithDigits
     }
 
@@ -165,7 +165,7 @@ public class FormatTestTest {
      * Test the property 'patternWithDigitsAndDelimiter'
      */
     @Test
-    public void patternWithDigitsAndDelimiterTest() {
+    void patternWithDigitsAndDelimiterTest() {
         // TODO: test patternWithDigitsAndDelimiter
     }
 

samples/client/petstore/java/resttemplate-withXml/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java

@@ -18,21 +18,21 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Model tests for HasOnlyReadOnly
  */
-public class HasOnlyReadOnlyTest {
+class HasOnlyReadOnlyTest {
     private final HasOnlyReadOnly model = new HasOnlyReadOnly();
 
     /**
      * Model tests for HasOnlyReadOnly
      */
     @Test
-    public void testHasOnlyReadOnly() {
+    void testHasOnlyReadOnly() {
         // TODO: test HasOnlyReadOnly
     }
 
@@ -40,7 +40,7 @@ public class HasOnlyReadOnlyTest {
      * Test the property 'bar'
      */
     @Test
-    public void barTest() {
+    void barTest() {
         // TODO: test bar
     }
 
@@ -48,7 +48,7 @@ public class HasOnlyReadOnlyTest {
      * Test the property 'foo'
      */
     @Test
-    public void fooTest() {
+    void fooTest() {
         // TODO: test foo
     }