upgrade okhttp-gson and google-api-client to junit5 (#18668)

* upgrade okhttp-gson and google-api-client to junit5

* add changes in StringUtilTest

* use https instead of http to fix 301 (moved) error

* revert petstore test server url to http://petstore.swagger.io and regenerate samples

* synced gradle/sbt/pom, re-generated samples

* revert removal of port 80 from test url

* udpate google api client tests

* update sha

* update comment

---------

Co-authored-by: Thorsten Hirsch <t.hirsch@web.de>

bin/utils/test_file_list.yaml

@@ -8,7 +8,7 @@
   sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230
 # java okhttp gson test files
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java"
-  sha256: db505f7801fef62c13a08a8e9ca1fc4c5c947ab46b46f12943139d353feacf17
+  sha256: 325fdd5d7e2c97790c0fb44f712ab7b2ba022d7e1a5b0056f47b07f342682b6d
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java"
   sha256: e673d9928c8eb848262d0116fe0d28db832e128671a810a7c966d06d90cb9b63
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java"

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/api_test.mustache

@@ -4,8 +4,8 @@ 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 java.io.IOException;
 import java.time.LocalDate;
@@ -18,12 +18,12 @@ import java.util.Map;
 /**
  * API tests for {{classname}}
  */
-@Ignore
 public class {{classname}}Test {
 
     private final {{classname}} api = new {{classname}}();
 
-    {{#operations}}{{#operation}}
+    {{#operations}}
+    {{#operation}}
     /**
      * {{summary}}
      *
@@ -37,9 +37,12 @@ public class {{classname}}Test {
         {{#allParams}}
         {{{dataType}}} {{paramName}} = null;
         {{/allParams}}
-        {{#returnType}}{{{.}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
+        // uncomment below to test the API function
+        //{{#returnType}}{{{.}}} response = {{/returnType}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
 
         // TODO: test validations
     }
-    {{/operation}}{{/operations}}
+
+    {{/operation}}
+    {{/operations}}
 }

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache

@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
+                <version>2.22.2</version>
                 <configuration>
                     <systemPropertyVariables>
                         <property>
@@ -73,7 +73,6 @@
                     </systemPropertyVariables>
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
             <plugin>
@@ -295,8 +294,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -326,6 +325,6 @@
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         {{/useJakartaEe}}
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>

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

@@ -135,9 +135,9 @@ dependencies {
     implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
     {{/dynamicOperations}}
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache

@@ -35,7 +35,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

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

@@ -438,7 +438,7 @@
 {{#useBeanValidation}}
         <beanvalidation-version>3.0.2</beanvalidation-version>
 {{/useBeanValidation}}
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/echo_api/java/okhttp-gson-user-defined-templates/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/echo_api/java/okhttp-gson-user-defined-templates/pom.xml

@@ -339,7 +339,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/echo_api/java/okhttp-gson/build.gradle

@@ -117,9 +117,9 @@ dependencies {
     implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/echo_api/java/okhttp-gson/build.sbt

@@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/echo_api/java/okhttp-gson/pom.xml

@@ -334,7 +334,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/CustomTest.java

@@ -13,7 +13,7 @@
 
 package org.openapitools.client;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.openapitools.client.ApiException;
 import org.openapitools.client.api.*;
 import org.openapitools.client.model.*;
@@ -46,13 +46,13 @@ public class CustomTest {
                 photoUrls(Arrays.asList(new String[]{"http://a.com", "http://b.com"})).category(new Category().id(987L).name("new category"));
 
         Pet p = bodyApi.testEchoBodyPet(queryObject);
-        Assert.assertNotNull(p);
+        Assertions.assertNotNull(p);
-        Assert.assertEquals("Hello World", p.getName());
+        Assertions.assertEquals("Hello World", p.getName());
-        Assert.assertEquals(Long.valueOf(12345L), p.getId());
+        Assertions.assertEquals(Long.valueOf(12345L), p.getId());
 
         // response is empty body
         Pet p2 = bodyApi.testEchoBodyPet(null);
-        Assert.assertNull(p2);
+        Assertions.assertNull(p2);
     }
 
     /**
@@ -70,7 +70,7 @@ public class CustomTest {
 
         String response = api.testQueryStyleFormExplodeTrueObject(queryObject);
         org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser(response);
-        Assert.assertEquals("/query/style_form/explode_true/object?id=12345&name=Hello%20World&category=class%20Category%20%7B%0A%20%20%20%20id%3A%20987%0A%20%20%20%20name%3A%20new%20category%0A%7D&photoUrls=http%3A%2F%2Fa.com&photoUrls=http%3A%2F%2Fb.com", p.path);
+        Assertions.assertEquals("/query/style_form/explode_true/object?id=12345&name=Hello%20World&category=class%20Category%20%7B%0A%20%20%20%20id%3A%20987%0A%20%20%20%20name%3A%20new%20category%0A%7D&photoUrls=http%3A%2F%2Fa.com&photoUrls=http%3A%2F%2Fb.com", p.path);
     }
 
     /**
@@ -88,7 +88,7 @@ public class CustomTest {
 
         String response = api.testQueryStyleDeepObjectExplodeTrueObject(queryObject);
         org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser(response);
-        Assert.assertEquals("/query/style_deepObject/explode_true/object?query_object[id]=12345&query_object[name]=Hello%20World&query_object[category][id]=987&query_object[category][name]=new%20category&query_object[photoUrls][0]=http%3A%2F%2Fa.com&query_object[photoUrls][1]=http%3A%2F%2Fb.com", p.path);
+        Assertions.assertEquals("/query/style_deepObject/explode_true/object?query_object[id]=12345&query_object[name]=Hello%20World&query_object[category][id]=987&query_object[category][name]=new%20category&query_object[photoUrls][0]=http%3A%2F%2Fa.com&query_object[photoUrls][1]=http%3A%2F%2Fb.com", p.path);
     }
 
     /**
@@ -106,7 +106,7 @@ public class CustomTest {
 
         String response = api.testQueryStyleDeepObjectExplodeTrueObjectAllOf(queryObject);
         org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser(response);
-        Assert.assertEquals("/query/style_deepObject/explode_true/object/allOf?query_object[size]=small&query_object[color]=red&query_object[id]=12345&query_object[name]=Hello%20World", p.path);
+        Assertions.assertEquals("/query/style_deepObject/explode_true/object/allOf?query_object[size]=small&query_object[color]=red&query_object[id]=12345&query_object[name]=Hello%20World", p.path);
     }
 
     /**
@@ -124,6 +124,6 @@ public class CustomTest {
 
         String response = api.testQueryStyleFormExplodeTrueArrayString(q);
         org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser(response);
-        Assert.assertEquals("/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path);
+        Assertions.assertEquals("/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path);
     }
 }

samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/api/AuthApiTest.java

@@ -13,7 +13,7 @@
 
 package org.openapitools.client.api;
 
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assertions;
 import org.openapitools.client.ApiException;
 import org.junit.jupiter.api.Disabled;

samples/client/others/java/okhttp-gson-oneOf/build.gradle

@@ -117,9 +117,9 @@ dependencies {
     implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/others/java/okhttp-gson-oneOf/build.sbt

@@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/others/java/okhttp-gson-oneOf/pom.xml

@@ -334,7 +334,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/others/java/okhttp-gson-streaming/build.gradle

@@ -117,9 +117,9 @@ dependencies {
     implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/others/java/okhttp-gson-streaming/build.sbt

@@ -21,7 +21,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/others/java/okhttp-gson-streaming/pom.xml

@@ -334,7 +334,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/google-api-client/pom.xml

@@ -56,7 +56,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12</version>
+                <version>2.22.2</version>
                 <configuration>
                     <systemPropertyVariables>
                         <property>
@@ -66,7 +66,6 @@
                     </systemPropertyVariables>
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
-                    <forkMode>pertest</forkMode>
                 </configuration>
             </plugin>
             <plugin>
@@ -252,8 +251,8 @@
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>junit-jupiter-api</artifactId>
             <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
@@ -267,6 +266,6 @@
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>4.13.2</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>

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

@@ -15,8 +15,8 @@ package org.openapitools.client.api;
 
 import org.openapitools.client.model.Client;
 import java.util.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.time.LocalDate;
@@ -29,12 +29,10 @@ import java.util.Map;
 /**
  * API tests for AnotherFakeApi
  */
-@Ignore
 public class AnotherFakeApiTest {
 
     private final AnotherFakeApi api = new AnotherFakeApi();
 
-    
     /**
      * To test special tags
      *
@@ -47,9 +45,10 @@ public class AnotherFakeApiTest {
     public void call123testSpecialTagsTest() throws IOException {
         UUID uuidTest = null;
         Client body = null;
-        Client response = api.call123testSpecialTags(uuidTest, body);
+        // uncomment below to test the API function
+        //Client response = api.call123testSpecialTags(uuidTest, body);
 
         // TODO: test validations
     }
-    
+
 }

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

@@ -22,8 +22,8 @@ import java.time.OffsetDateTime;
 import org.openapitools.client.model.OuterComposite;
 import org.openapitools.client.model.User;
 import org.openapitools.client.model.XmlItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.time.LocalDate;
@@ -36,12 +36,10 @@ import java.util.Map;
 /**
  * API tests for FakeApi
  */
-@Ignore
 public class FakeApiTest {
 
     private final FakeApi api = new FakeApi();
 
-    
     /**
      * creates an XmlItem
      *
@@ -53,11 +51,12 @@ public class FakeApiTest {
     @Test
     public void createXmlItemTest() throws IOException {
         XmlItem xmlItem = null;
-        api.createXmlItem(xmlItem);
+        // uncomment below to test the API function
+        //api.createXmlItem(xmlItem);
 
         // TODO: test validations
     }
-    
+
     /**
      * 
      *
@@ -69,11 +68,12 @@ public class FakeApiTest {
     @Test
     public void fakeOuterBooleanSerializeTest() throws IOException {
         Boolean body = null;
-        Boolean response = api.fakeOuterBooleanSerialize(body);
+        // uncomment below to test the API function
+        //Boolean response = api.fakeOuterBooleanSerialize(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * 
      *
@@ -85,11 +85,12 @@ public class FakeApiTest {
     @Test
     public void fakeOuterCompositeSerializeTest() throws IOException {
         OuterComposite body = null;
-        OuterComposite response = api.fakeOuterCompositeSerialize(body);
+        // uncomment below to test the API function
+        //OuterComposite response = api.fakeOuterCompositeSerialize(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * 
      *
@@ -101,11 +102,12 @@ public class FakeApiTest {
     @Test
     public void fakeOuterNumberSerializeTest() throws IOException {
         BigDecimal body = null;
-        BigDecimal response = api.fakeOuterNumberSerialize(body);
+        // uncomment below to test the API function
+        //BigDecimal response = api.fakeOuterNumberSerialize(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * 
      *
@@ -117,11 +119,12 @@ public class FakeApiTest {
     @Test
     public void fakeOuterStringSerializeTest() throws IOException {
         String body = null;
-        String response = api.fakeOuterStringSerialize(body);
+        // uncomment below to test the API function
+        //String response = api.fakeOuterStringSerialize(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * 
      *
@@ -133,11 +136,12 @@ public class FakeApiTest {
     @Test
     public void testBodyWithFileSchemaTest() throws IOException {
         FileSchemaTestClass body = null;
-        api.testBodyWithFileSchema(body);
+        // uncomment below to test the API function
+        //api.testBodyWithFileSchema(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * 
      *
@@ -150,11 +154,12 @@ public class FakeApiTest {
     public void testBodyWithQueryParamsTest() throws IOException {
         String query = null;
         User body = null;
-        api.testBodyWithQueryParams(query, body);
+        // uncomment below to test the API function
+        //api.testBodyWithQueryParams(query, body);
 
         // TODO: test validations
     }
-    
+
     /**
      * To test \"client\" model
      *
@@ -166,11 +171,12 @@ public class FakeApiTest {
     @Test
     public void testClientModelTest() throws IOException {
         Client body = null;
-        Client response = api.testClientModel(body);
+        // uncomment below to test the API function
+        //Client response = api.testClientModel(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
      *
@@ -195,11 +201,12 @@ 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);
+        // uncomment below to test the API function
+        //api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
 
         // TODO: test validations
     }
-    
+
     /**
      * To test enum parameters
      *
@@ -218,11 +225,12 @@ public class FakeApiTest {
         Double enumQueryDouble = null;
         List<String> enumFormStringArray = null;
         String enumFormString = null;
-        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+        // uncomment below to test the API function
+        //api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
 
         // TODO: test validations
     }
-    
+
     /**
      * Fake endpoint to test group parameters (optional)
      *
@@ -239,11 +247,12 @@ public class FakeApiTest {
         Integer stringGroup = null;
         Boolean booleanGroup = null;
         Long int64Group = null;
-        api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+        // uncomment below to test the API function
+        //api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
 
         // TODO: test validations
     }
-    
+
     /**
      * test inline additionalProperties
      *
@@ -255,11 +264,12 @@ public class FakeApiTest {
     @Test
     public void testInlineAdditionalPropertiesTest() throws IOException {
         Map<String, String> param = null;
-        api.testInlineAdditionalProperties(param);
+        // uncomment below to test the API function
+        //api.testInlineAdditionalProperties(param);
 
         // TODO: test validations
     }
-    
+
     /**
      * test json serialization of form data
      *
@@ -272,11 +282,12 @@ public class FakeApiTest {
     public void testJsonFormDataTest() throws IOException {
         String param = null;
         String param2 = null;
-        api.testJsonFormData(param, param2);
+        // uncomment below to test the API function
+        //api.testJsonFormData(param, param2);
 
         // TODO: test validations
     }
-    
+
     /**
      * 
      *
@@ -292,9 +303,10 @@ public class FakeApiTest {
         List<String> http = null;
         List<String> url = null;
         List<String> context = null;
-        api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
+        // uncomment below to test the API function
+        //api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context);
 
         // TODO: test validations
     }
-    
+
 }

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

@@ -14,8 +14,8 @@
 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 java.io.IOException;
 import java.time.LocalDate;
@@ -28,12 +28,10 @@ import java.util.Map;
 /**
  * API tests for FakeClassnameTags123Api
  */
-@Ignore
 public class FakeClassnameTags123ApiTest {
 
     private final FakeClassnameTags123Api api = new FakeClassnameTags123Api();
 
-    
     /**
      * To test class name in snake case
      *
@@ -45,9 +43,10 @@ public class FakeClassnameTags123ApiTest {
     @Test
     public void testClassnameTest() throws IOException {
         Client body = null;
-        Client response = api.testClassname(body);
+        // uncomment below to test the API function
+        //Client response = api.testClassname(body);
 
         // TODO: test validations
     }
-    
+
 }

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

@@ -17,8 +17,8 @@ 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 java.io.IOException;
 import java.time.LocalDate;
@@ -31,12 +31,10 @@ import java.util.Map;
 /**
  * API tests for PetApi
  */
-@Ignore
 public class PetApiTest {
 
     private final PetApi api = new PetApi();
 
-    
     /**
      * Add a new pet to the store
      *
@@ -48,11 +46,12 @@ public class PetApiTest {
     @Test
     public void addPetTest() throws IOException {
         Pet body = null;
-        api.addPet(body);
+        // uncomment below to test the API function
+        //api.addPet(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * Deletes a pet
      *
@@ -65,11 +64,12 @@ public class PetApiTest {
     public void deletePetTest() throws IOException {
         Long petId = null;
         String apiKey = null;
-        api.deletePet(petId, apiKey);
+        // uncomment below to test the API function
+        //api.deletePet(petId, apiKey);
 
         // TODO: test validations
     }
-    
+
     /**
      * Finds Pets by status
      *
@@ -81,11 +81,12 @@ public class PetApiTest {
     @Test
     public void findPetsByStatusTest() throws IOException {
         List<String> status = null;
-        List<Pet> response = api.findPetsByStatus(status);
+        // uncomment below to test the API function
+        //List<Pet> response = api.findPetsByStatus(status);
 
         // TODO: test validations
     }
-    
+
     /**
      * Finds Pets by tags
      *
@@ -97,11 +98,12 @@ public class PetApiTest {
     @Test
     public void findPetsByTagsTest() throws IOException {
         Set<String> tags = null;
-        Set<Pet> response = api.findPetsByTags(tags);
+        // uncomment below to test the API function
+        //Set<Pet> response = api.findPetsByTags(tags);
 
         // TODO: test validations
     }
-    
+
     /**
      * Find pet by ID
      *
@@ -113,11 +115,12 @@ public class PetApiTest {
     @Test
     public void getPetByIdTest() throws IOException {
         Long petId = null;
-        Pet response = api.getPetById(petId);
+        // uncomment below to test the API function
+        //Pet response = api.getPetById(petId);
 
         // TODO: test validations
     }
-    
+
     /**
      * Update an existing pet
      *
@@ -129,11 +132,12 @@ public class PetApiTest {
     @Test
     public void updatePetTest() throws IOException {
         Pet body = null;
-        api.updatePet(body);
+        // uncomment below to test the API function
+        //api.updatePet(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * Updates a pet in the store with form data
      *
@@ -147,11 +151,12 @@ public class PetApiTest {
         Long petId = null;
         String name = null;
         String status = null;
-        api.updatePetWithForm(petId, name, status);
+        // uncomment below to test the API function
+        //api.updatePetWithForm(petId, name, status);
 
         // TODO: test validations
     }
-    
+
     /**
      * uploads an image
      *
@@ -165,11 +170,12 @@ public class PetApiTest {
         Long petId = null;
         String additionalMetadata = null;
         File _file = null;
-        ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
+        // uncomment below to test the API function
+        //ModelApiResponse response = api.uploadFile(petId, additionalMetadata, _file);
 
         // TODO: test validations
     }
-    
+
     /**
      * uploads an image (required)
      *
@@ -183,9 +189,10 @@ public class PetApiTest {
         Long petId = null;
         File requiredFile = null;
         String additionalMetadata = null;
-        ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+        // uncomment below to test the API function
+        //ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
 
         // TODO: test validations
     }
-    
+
 }

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

@@ -14,8 +14,8 @@
 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 java.io.IOException;
 import java.time.LocalDate;
@@ -28,12 +28,10 @@ import java.util.Map;
 /**
  * API tests for StoreApi
  */
-@Ignore
 public class StoreApiTest {
 
     private final StoreApi api = new StoreApi();
 
-    
     /**
      * Delete purchase order by ID
      *
@@ -45,11 +43,12 @@ public class StoreApiTest {
     @Test
     public void deleteOrderTest() throws IOException {
         String orderId = null;
-        api.deleteOrder(orderId);
+        // uncomment below to test the API function
+        //api.deleteOrder(orderId);
 
         // TODO: test validations
     }
-    
+
     /**
      * Returns pet inventories by status
      *
@@ -60,11 +59,12 @@ public class StoreApiTest {
      */
     @Test
     public void getInventoryTest() throws IOException {
-        Map<String, Integer> response = api.getInventory();
+        // uncomment below to test the API function
+        //Map<String, Integer> response = api.getInventory();
 
         // TODO: test validations
     }
-    
+
     /**
      * Find purchase order by ID
      *
@@ -76,11 +76,12 @@ public class StoreApiTest {
     @Test
     public void getOrderByIdTest() throws IOException {
         Long orderId = null;
-        Order response = api.getOrderById(orderId);
+        // uncomment below to test the API function
+        //Order response = api.getOrderById(orderId);
 
         // TODO: test validations
     }
-    
+
     /**
      * Place an order for a pet
      *
@@ -92,9 +93,10 @@ public class StoreApiTest {
     @Test
     public void placeOrderTest() throws IOException {
         Order body = null;
-        Order response = api.placeOrder(body);
+        // uncomment below to test the API function
+        //Order response = api.placeOrder(body);
 
         // TODO: test validations
     }
-    
+
 }

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

@@ -15,8 +15,8 @@ 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 java.io.IOException;
 import java.time.LocalDate;
@@ -29,12 +29,10 @@ import java.util.Map;
 /**
  * API tests for UserApi
  */
-@Ignore
 public class UserApiTest {
 
     private final UserApi api = new UserApi();
 
-    
     /**
      * Create user
      *
@@ -46,11 +44,12 @@ public class UserApiTest {
     @Test
     public void createUserTest() throws IOException {
         User body = null;
-        api.createUser(body);
+        // uncomment below to test the API function
+        //api.createUser(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * Creates list of users with given input array
      *
@@ -62,11 +61,12 @@ public class UserApiTest {
     @Test
     public void createUsersWithArrayInputTest() throws IOException {
         List<User> body = null;
-        api.createUsersWithArrayInput(body);
+        // uncomment below to test the API function
+        //api.createUsersWithArrayInput(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * Creates list of users with given input array
      *
@@ -78,11 +78,12 @@ public class UserApiTest {
     @Test
     public void createUsersWithListInputTest() throws IOException {
         List<User> body = null;
-        api.createUsersWithListInput(body);
+        // uncomment below to test the API function
+        //api.createUsersWithListInput(body);
 
         // TODO: test validations
     }
-    
+
     /**
      * Delete user
      *
@@ -94,11 +95,12 @@ public class UserApiTest {
     @Test
     public void deleteUserTest() throws IOException {
         String username = null;
-        api.deleteUser(username);
+        // uncomment below to test the API function
+        //api.deleteUser(username);
 
         // TODO: test validations
     }
-    
+
     /**
      * Get user by user name
      *
@@ -110,11 +112,12 @@ public class UserApiTest {
     @Test
     public void getUserByNameTest() throws IOException {
         String username = null;
-        User response = api.getUserByName(username);
+        // uncomment below to test the API function
+        //User response = api.getUserByName(username);
 
         // TODO: test validations
     }
-    
+
     /**
      * Logs user into the system
      *
@@ -127,11 +130,12 @@ public class UserApiTest {
     public void loginUserTest() throws IOException {
         String username = null;
         String password = null;
-        String response = api.loginUser(username, password);
+        // uncomment below to test the API function
+        //String response = api.loginUser(username, password);
 
         // TODO: test validations
     }
-    
+
     /**
      * Logs out current logged in user session
      *
@@ -142,11 +146,12 @@ public class UserApiTest {
      */
     @Test
     public void logoutUserTest() throws IOException {
-        api.logoutUser();
+        // uncomment below to test the API function
+        //api.logoutUser();
 
         // TODO: test validations
     }
-    
+
     /**
      * Updated user
      *
@@ -159,9 +164,10 @@ public class UserApiTest {
     public void updateUserTest() throws IOException {
         String username = null;
         User body = null;
-        api.updateUser(username, body);
+        // uncomment below to test the API function
+        //api.updateUser(username, body);
 
         // TODO: test validations
     }
-    
+
 }

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.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 AdditionalPropertiesAnyType
  */
-public class AdditionalPropertiesAnyTypeTest {
+class AdditionalPropertiesAnyTypeTest {
     private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
 
     /**
      * Model tests for AdditionalPropertiesAnyType
      */
     @Test
-    public void testAdditionalPropertiesAnyType() {
+    void testAdditionalPropertiesAnyType() {
         // TODO: test AdditionalPropertiesAnyType
     }
 
@@ -42,7 +42,7 @@ public class AdditionalPropertiesAnyTypeTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java

@@ -21,21 +21,21 @@ import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.HashMap;
 import java.util.List;
 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 AdditionalPropertiesArray
  */
-public class AdditionalPropertiesArrayTest {
+class AdditionalPropertiesArrayTest {
     private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
 
     /**
      * Model tests for AdditionalPropertiesArray
      */
     @Test
-    public void testAdditionalPropertiesArray() {
+    void testAdditionalPropertiesArray() {
         // TODO: test AdditionalPropertiesArray
     }
 
@@ -43,7 +43,7 @@ public class AdditionalPropertiesArrayTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.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 AdditionalPropertiesBoolean
  */
-public class AdditionalPropertiesBooleanTest {
+class AdditionalPropertiesBooleanTest {
     private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
 
     /**
      * Model tests for AdditionalPropertiesBoolean
      */
     @Test
-    public void testAdditionalPropertiesBoolean() {
+    void testAdditionalPropertiesBoolean() {
         // TODO: test AdditionalPropertiesBoolean
     }
 
@@ -42,7 +42,7 @@ public class AdditionalPropertiesBooleanTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java

@@ -22,21 +22,21 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 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
     }
 
@@ -44,7 +44,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapString'
      */
     @Test
-    public void mapStringTest() {
+    void mapStringTest() {
         // TODO: test mapString
     }
 
@@ -52,7 +52,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapNumber'
      */
     @Test
-    public void mapNumberTest() {
+    void mapNumberTest() {
         // TODO: test mapNumber
     }
 
@@ -60,7 +60,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapInteger'
      */
     @Test
-    public void mapIntegerTest() {
+    void mapIntegerTest() {
         // TODO: test mapInteger
     }
 
@@ -68,7 +68,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapBoolean'
      */
     @Test
-    public void mapBooleanTest() {
+    void mapBooleanTest() {
         // TODO: test mapBoolean
     }
 
@@ -76,7 +76,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapArrayInteger'
      */
     @Test
-    public void mapArrayIntegerTest() {
+    void mapArrayIntegerTest() {
         // TODO: test mapArrayInteger
     }
 
@@ -84,7 +84,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapArrayAnytype'
      */
     @Test
-    public void mapArrayAnytypeTest() {
+    void mapArrayAnytypeTest() {
         // TODO: test mapArrayAnytype
     }
 
@@ -92,7 +92,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapMapString'
      */
     @Test
-    public void mapMapStringTest() {
+    void mapMapStringTest() {
         // TODO: test mapMapString
     }
 
@@ -100,7 +100,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'mapMapAnytype'
      */
     @Test
-    public void mapMapAnytypeTest() {
+    void mapMapAnytypeTest() {
         // TODO: test mapMapAnytype
     }
 
@@ -108,7 +108,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype1'
      */
     @Test
-    public void anytype1Test() {
+    void anytype1Test() {
         // TODO: test anytype1
     }
 
@@ -116,7 +116,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype2'
      */
     @Test
-    public void anytype2Test() {
+    void anytype2Test() {
         // TODO: test anytype2
     }
 
@@ -124,7 +124,7 @@ public class AdditionalPropertiesClassTest {
      * Test the property 'anytype3'
      */
     @Test
-    public void anytype3Test() {
+    void anytype3Test() {
         // TODO: test anytype3
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.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 AdditionalPropertiesInteger
  */
-public class AdditionalPropertiesIntegerTest {
+class AdditionalPropertiesIntegerTest {
     private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
 
     /**
      * Model tests for AdditionalPropertiesInteger
      */
     @Test
-    public void testAdditionalPropertiesInteger() {
+    void testAdditionalPropertiesInteger() {
         // TODO: test AdditionalPropertiesInteger
     }
 
@@ -42,7 +42,7 @@ public class AdditionalPropertiesIntegerTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.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 AdditionalPropertiesNumber
  */
-public class AdditionalPropertiesNumberTest {
+class AdditionalPropertiesNumberTest {
     private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
 
     /**
      * Model tests for AdditionalPropertiesNumber
      */
     @Test
-    public void testAdditionalPropertiesNumber() {
+    void testAdditionalPropertiesNumber() {
         // TODO: test AdditionalPropertiesNumber
     }
 
@@ -43,7 +43,7 @@ public class AdditionalPropertiesNumberTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.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 AdditionalPropertiesObject
  */
-public class AdditionalPropertiesObjectTest {
+class AdditionalPropertiesObjectTest {
     private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
 
     /**
      * Model tests for AdditionalPropertiesObject
      */
     @Test
-    public void testAdditionalPropertiesObject() {
+    void testAdditionalPropertiesObject() {
         // TODO: test AdditionalPropertiesObject
     }
 
@@ -42,7 +42,7 @@ public class AdditionalPropertiesObjectTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.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 AdditionalPropertiesString
  */
-public class AdditionalPropertiesStringTest {
+class AdditionalPropertiesStringTest {
     private final AdditionalPropertiesString model = new AdditionalPropertiesString();
 
     /**
      * Model tests for AdditionalPropertiesString
      */
     @Test
-    public void testAdditionalPropertiesString() {
+    void testAdditionalPropertiesString() {
         // TODO: test AdditionalPropertiesString
     }
 
@@ -42,7 +42,7 @@ public class AdditionalPropertiesStringTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/src/test/java/org/openapitools/client/model/BigCatTest.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.Cat;
-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 BigCat
  */
-public class BigCatTest {
+class BigCatTest {
     private final BigCat model = new BigCat();
 
     /**
      * Model tests for BigCat
      */
     @Test
-    public void testBigCat() {
+    void testBigCat() {
         // TODO: test BigCat
     }
 
@@ -44,7 +44,7 @@ public class BigCatTest {
      * Test the property 'className'
      */
     @Test
-    public void classNameTest() {
+    void classNameTest() {
         // TODO: test className
     }
 
@@ -52,7 +52,7 @@ public class BigCatTest {
      * Test the property 'color'
      */
     @Test
-    public void colorTest() {
+    void colorTest() {
         // TODO: test color
     }
 
@@ -60,7 +60,7 @@ public class BigCatTest {
      * Test the property 'declawed'
      */
     @Test
-    public void declawedTest() {
+    void declawedTest() {
         // TODO: test declawed
     }
 
@@ -68,7 +68,7 @@ public class BigCatTest {
      * Test the property 'kind'
      */
     @Test
-    public void kindTest() {
+    void kindTest() {
         // TODO: test kind
     }
 

samples/client/petstore/java/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/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/google-api-client/src/test/java/org/openapitools/client/model/EnumTestTest.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.OuterEnum;
-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
     }
 
@@ -41,7 +41,7 @@ public class EnumTestTest {
      * Test the property 'enumString'
      */
     @Test
-    public void enumStringTest() {
+    void enumStringTest() {
         // TODO: test enumString
     }
 
@@ -49,7 +49,7 @@ public class EnumTestTest {
      * Test the property 'enumStringRequired'
      */
     @Test
-    public void enumStringRequiredTest() {
+    void enumStringRequiredTest() {
         // TODO: test enumStringRequired
     }
 
@@ -57,7 +57,7 @@ public class EnumTestTest {
      * Test the property 'enumInteger'
      */
     @Test
-    public void enumIntegerTest() {
+    void enumIntegerTest() {
         // TODO: test enumInteger
     }
 
@@ -65,7 +65,7 @@ public class EnumTestTest {
      * Test the property 'enumNumber'
      */
     @Test
-    public void enumNumberTest() {
+    void enumNumberTest() {
         // TODO: test enumNumber
     }
 
@@ -73,7 +73,7 @@ public class EnumTestTest {
      * Test the property 'outerEnum'
      */
     @Test
-    public void outerEnumTest() {
+    void outerEnumTest() {
         // TODO: test outerEnum
     }
 

samples/client/petstore/java/google-api-client/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/google-api-client/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 'string'
      */
     @Test
-    public void stringTest() {
+    void stringTest() {
         // TODO: test string
     }
 
@@ -101,7 +101,7 @@ public class FormatTestTest {
      * Test the property '_byte'
      */
     @Test
-    public void _byteTest() {
+    void _byteTest() {
         // TODO: test _byte
     }
 
@@ -109,7 +109,7 @@ public class FormatTestTest {
      * Test the property 'binary'
      */
     @Test
-    public void binaryTest() {
+    void binaryTest() {
         // TODO: test binary
     }
 
@@ -117,7 +117,7 @@ public class FormatTestTest {
      * Test the property 'date'
      */
     @Test
-    public void dateTest() {
+    void dateTest() {
         // TODO: test date
     }
 
@@ -125,7 +125,7 @@ public class FormatTestTest {
      * Test the property 'dateTime'
      */
     @Test
-    public void dateTimeTest() {
+    void dateTimeTest() {
         // TODO: test dateTime
     }
 
@@ -133,7 +133,7 @@ public class FormatTestTest {
      * Test the property 'uuid'
      */
     @Test
-    public void uuidTest() {
+    void uuidTest() {
         // TODO: test uuid
     }
 
@@ -141,7 +141,7 @@ public class FormatTestTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -149,7 +149,7 @@ public class FormatTestTest {
      * Test the property 'bigDecimal'
      */
     @Test
-    public void bigDecimalTest() {
+    void bigDecimalTest() {
         // TODO: test bigDecimal
     }
 

samples/client/petstore/java/google-api-client/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
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/MapTestTest.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 MapTest
  */
-public class MapTestTest {
+class MapTestTest {
     private final MapTest model = new MapTest();
 
     /**
      * Model tests for MapTest
      */
     @Test
-    public void testMapTest() {
+    void testMapTest() {
         // TODO: test MapTest
     }
 
@@ -42,7 +42,7 @@ public class MapTestTest {
      * Test the property 'mapMapOfString'
      */
     @Test
-    public void mapMapOfStringTest() {
+    void mapMapOfStringTest() {
         // TODO: test mapMapOfString
     }
 
@@ -50,7 +50,7 @@ public class MapTestTest {
      * Test the property 'mapOfEnumString'
      */
     @Test
-    public void mapOfEnumStringTest() {
+    void mapOfEnumStringTest() {
         // TODO: test mapOfEnumString
     }
 
@@ -58,7 +58,7 @@ public class MapTestTest {
      * Test the property 'directMap'
      */
     @Test
-    public void directMapTest() {
+    void directMapTest() {
         // TODO: test directMap
     }
 
@@ -66,7 +66,7 @@ public class MapTestTest {
      * Test the property 'indirectMap'
      */
     @Test
-    public void indirectMapTest() {
+    void indirectMapTest() {
         // TODO: test indirectMap
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java

@@ -23,21 +23,21 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 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 MixedPropertiesAndAdditionalPropertiesClass
  */
-public class MixedPropertiesAndAdditionalPropertiesClassTest {
+class MixedPropertiesAndAdditionalPropertiesClassTest {
     private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
 
     /**
      * Model tests for MixedPropertiesAndAdditionalPropertiesClass
      */
     @Test
-    public void testMixedPropertiesAndAdditionalPropertiesClass() {
+    void testMixedPropertiesAndAdditionalPropertiesClass() {
         // TODO: test MixedPropertiesAndAdditionalPropertiesClass
     }
 
@@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassTest {
      * Test the property 'uuid'
      */
     @Test
-    public void uuidTest() {
+    void uuidTest() {
         // TODO: test uuid
     }
 
@@ -53,7 +53,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassTest {
      * Test the property 'dateTime'
      */
     @Test
-    public void dateTimeTest() {
+    void dateTimeTest() {
         // TODO: test dateTime
     }
 
@@ -61,7 +61,7 @@ public class MixedPropertiesAndAdditionalPropertiesClassTest {
      * Test the property 'map'
      */
     @Test
-    public void mapTest() {
+    void mapTest() {
         // TODO: test map
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/Model200ResponseTest.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 Model200Response
  */
-public class Model200ResponseTest {
+class Model200ResponseTest {
     private final Model200Response model = new Model200Response();
 
     /**
      * Model tests for Model200Response
      */
     @Test
-    public void testModel200Response() {
+    void testModel200Response() {
         // TODO: test Model200Response
     }
 
@@ -40,7 +40,7 @@ public class Model200ResponseTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -48,7 +48,7 @@ public class Model200ResponseTest {
      * Test the property 'propertyClass'
      */
     @Test
-    public void propertyClassTest() {
+    void propertyClassTest() {
         // TODO: test propertyClass
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/ModelApiResponseTest.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 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
     }
 
@@ -40,7 +40,7 @@ public class ModelApiResponseTest {
      * Test the property 'code'
      */
     @Test
-    public void codeTest() {
+    void codeTest() {
         // TODO: test code
     }
 
@@ -48,7 +48,7 @@ public class ModelApiResponseTest {
      * Test the property 'type'
      */
     @Test
-    public void typeTest() {
+    void typeTest() {
         // TODO: test type
     }
 
@@ -56,7 +56,7 @@ public class ModelApiResponseTest {
      * Test the property 'message'
      */
     @Test
-    public void messageTest() {
+    void messageTest() {
         // TODO: test message
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/ModelFileTest.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 ModelFile
  */
-public class ModelFileTest {
+class ModelFileTest {
     private final ModelFile model = new ModelFile();
 
     /**
      * Model tests for ModelFile
      */
     @Test
-    public void testModelFile() {
+    void testModelFile() {
         // TODO: test ModelFile
     }
 
@@ -40,7 +40,7 @@ public class ModelFileTest {
      * Test the property 'sourceURI'
      */
     @Test
-    public void sourceURITest() {
+    void sourceURITest() {
         // TODO: test sourceURI
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/ModelListTest.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 ModelList
  */
-public class ModelListTest {
+class ModelListTest {
     private final ModelList model = new ModelList();
 
     /**
      * Model tests for ModelList
      */
     @Test
-    public void testModelList() {
+    void testModelList() {
         // TODO: test ModelList
     }
 
@@ -40,7 +40,7 @@ public class ModelListTest {
      * Test the property '_123list'
      */
     @Test
-    public void _123listTest() {
+    void _123listTest() {
         // TODO: test _123list
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/ModelReturnTest.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 ModelReturn
  */
-public class ModelReturnTest {
+class ModelReturnTest {
     private final ModelReturn model = new ModelReturn();
 
     /**
      * Model tests for ModelReturn
      */
     @Test
-    public void testModelReturn() {
+    void testModelReturn() {
         // TODO: test ModelReturn
     }
 
@@ -40,7 +40,7 @@ public class ModelReturnTest {
      * Test the property '_return'
      */
     @Test
-    public void _returnTest() {
+    void _returnTest() {
         // TODO: test _return
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/NameTest.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 Name
  */
-public class NameTest {
+class NameTest {
     private final Name model = new Name();
 
     /**
      * Model tests for Name
      */
     @Test
-    public void testName() {
+    void testName() {
         // TODO: test Name
     }
 
@@ -40,7 +40,7 @@ public class NameTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -48,7 +48,7 @@ public class NameTest {
      * Test the property 'snakeCase'
      */
     @Test
-    public void snakeCaseTest() {
+    void snakeCaseTest() {
         // TODO: test snakeCase
     }
 
@@ -56,7 +56,7 @@ public class NameTest {
      * Test the property 'property'
      */
     @Test
-    public void propertyTest() {
+    void propertyTest() {
         // TODO: test property
     }
 
@@ -64,7 +64,7 @@ public class NameTest {
      * Test the property '_123number'
      */
     @Test
-    public void _123numberTest() {
+    void _123numberTest() {
         // TODO: test _123number
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/NumberOnlyTest.java

@@ -19,21 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
-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 NumberOnly
  */
-public class NumberOnlyTest {
+class NumberOnlyTest {
     private final NumberOnly model = new NumberOnly();
 
     /**
      * Model tests for NumberOnly
      */
     @Test
-    public void testNumberOnly() {
+    void testNumberOnly() {
         // TODO: test NumberOnly
     }
 
@@ -41,7 +41,7 @@ public class NumberOnlyTest {
      * Test the property 'justNumber'
      */
     @Test
-    public void justNumberTest() {
+    void justNumberTest() {
         // TODO: test justNumber
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/OrderTest.java

@@ -19,21 +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
     }
 
@@ -41,7 +41,7 @@ public class OrderTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -49,7 +49,7 @@ public class OrderTest {
      * Test the property 'petId'
      */
     @Test
-    public void petIdTest() {
+    void petIdTest() {
         // TODO: test petId
     }
 
@@ -57,7 +57,7 @@ public class OrderTest {
      * Test the property 'quantity'
      */
     @Test
-    public void quantityTest() {
+    void quantityTest() {
         // TODO: test quantity
     }
 
@@ -65,7 +65,7 @@ public class OrderTest {
      * Test the property 'shipDate'
      */
     @Test
-    public void shipDateTest() {
+    void shipDateTest() {
         // TODO: test shipDate
     }
 
@@ -73,7 +73,7 @@ public class OrderTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 
@@ -81,7 +81,7 @@ public class OrderTest {
      * Test the property 'complete'
      */
     @Test
-    public void completeTest() {
+    void completeTest() {
         // TODO: test complete
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/OuterCompositeTest.java

@@ -19,21 +19,21 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.math.BigDecimal;
-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 OuterComposite
  */
-public class OuterCompositeTest {
+class OuterCompositeTest {
     private final OuterComposite model = new OuterComposite();
 
     /**
      * Model tests for OuterComposite
      */
     @Test
-    public void testOuterComposite() {
+    void testOuterComposite() {
         // TODO: test OuterComposite
     }
 
@@ -41,7 +41,7 @@ public class OuterCompositeTest {
      * Test the property 'myNumber'
      */
     @Test
-    public void myNumberTest() {
+    void myNumberTest() {
         // TODO: test myNumber
     }
 
@@ -49,7 +49,7 @@ public class OuterCompositeTest {
      * Test the property 'myString'
      */
     @Test
-    public void myStringTest() {
+    void myStringTest() {
         // TODO: test myString
     }
 
@@ -57,7 +57,7 @@ public class OuterCompositeTest {
      * Test the property 'myBoolean'
      */
     @Test
-    public void myBooleanTest() {
+    void myBooleanTest() {
         // TODO: test myBoolean
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/OuterEnumTest.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 OuterEnum
  */
-public class OuterEnumTest {
+class OuterEnumTest {
     /**
      * Model tests for OuterEnum
      */
     @Test
-    public void testOuterEnum() {
+    void testOuterEnum() {
         // TODO: test OuterEnum
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/PetTest.java

@@ -26,21 +26,21 @@ import java.util.List;
 import java.util.Set;
 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
     }
 
@@ -48,7 +48,7 @@ public class PetTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -56,7 +56,7 @@ public class PetTest {
      * Test the property 'category'
      */
     @Test
-    public void categoryTest() {
+    void categoryTest() {
         // TODO: test category
     }
 
@@ -64,7 +64,7 @@ public class PetTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 
@@ -72,7 +72,7 @@ public class PetTest {
      * Test the property 'photoUrls'
      */
     @Test
-    public void photoUrlsTest() {
+    void photoUrlsTest() {
         // TODO: test photoUrls
     }
 
@@ -80,7 +80,7 @@ public class PetTest {
      * Test the property 'tags'
      */
     @Test
-    public void tagsTest() {
+    void tagsTest() {
         // TODO: test tags
     }
 
@@ -88,7 +88,7 @@ public class PetTest {
      * Test the property 'status'
      */
     @Test
-    public void statusTest() {
+    void statusTest() {
         // TODO: test status
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.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 ReadOnlyFirst
  */
-public class ReadOnlyFirstTest {
+class ReadOnlyFirstTest {
     private final ReadOnlyFirst model = new ReadOnlyFirst();
 
     /**
      * Model tests for ReadOnlyFirst
      */
     @Test
-    public void testReadOnlyFirst() {
+    void testReadOnlyFirst() {
         // TODO: test ReadOnlyFirst
     }
 
@@ -40,7 +40,7 @@ public class ReadOnlyFirstTest {
      * Test the property 'bar'
      */
     @Test
-    public void barTest() {
+    void barTest() {
         // TODO: test bar
     }
 
@@ -48,7 +48,7 @@ public class ReadOnlyFirstTest {
      * Test the property 'baz'
      */
     @Test
-    public void bazTest() {
+    void bazTest() {
         // TODO: test baz
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/SpecialModelNameTest.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 SpecialModelName
  */
-public class SpecialModelNameTest {
+class SpecialModelNameTest {
     private final SpecialModelName model = new SpecialModelName();
 
     /**
      * Model tests for SpecialModelName
      */
     @Test
-    public void testSpecialModelName() {
+    void testSpecialModelName() {
         // TODO: test SpecialModelName
     }
 
@@ -40,7 +40,7 @@ public class SpecialModelNameTest {
      * Test the property '$specialPropertyName'
      */
     @Test
-    public void $specialPropertyNameTest() {
+    void $specialPropertyNameTest() {
         // TODO: test $specialPropertyName
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/TagTest.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 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
     }
 
@@ -40,7 +40,7 @@ public class TagTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -48,7 +48,7 @@ public class TagTest {
      * Test the property 'name'
      */
     @Test
-    public void nameTest() {
+    void nameTest() {
         // TODO: test name
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.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 TypeHolderDefault
  */
-public class TypeHolderDefaultTest {
+class TypeHolderDefaultTest {
     private final TypeHolderDefault model = new TypeHolderDefault();
 
     /**
      * Model tests for TypeHolderDefault
      */
     @Test
-    public void testTypeHolderDefault() {
+    void testTypeHolderDefault() {
         // TODO: test TypeHolderDefault
     }
 
@@ -44,7 +44,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'stringItem'
      */
     @Test
-    public void stringItemTest() {
+    void stringItemTest() {
         // TODO: test stringItem
     }
 
@@ -52,7 +52,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'numberItem'
      */
     @Test
-    public void numberItemTest() {
+    void numberItemTest() {
         // TODO: test numberItem
     }
 
@@ -60,7 +60,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'integerItem'
      */
     @Test
-    public void integerItemTest() {
+    void integerItemTest() {
         // TODO: test integerItem
     }
 
@@ -68,7 +68,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'boolItem'
      */
     @Test
-    public void boolItemTest() {
+    void boolItemTest() {
         // TODO: test boolItem
     }
 
@@ -76,7 +76,7 @@ public class TypeHolderDefaultTest {
      * Test the property 'arrayItem'
      */
     @Test
-    public void arrayItemTest() {
+    void arrayItemTest() {
         // TODO: test arrayItem
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.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 TypeHolderExample
  */
-public class TypeHolderExampleTest {
+class TypeHolderExampleTest {
     private final TypeHolderExample model = new TypeHolderExample();
 
     /**
      * Model tests for TypeHolderExample
      */
     @Test
-    public void testTypeHolderExample() {
+    void testTypeHolderExample() {
         // TODO: test TypeHolderExample
     }
 
@@ -44,7 +44,7 @@ public class TypeHolderExampleTest {
      * Test the property 'stringItem'
      */
     @Test
-    public void stringItemTest() {
+    void stringItemTest() {
         // TODO: test stringItem
     }
 
@@ -52,7 +52,7 @@ public class TypeHolderExampleTest {
      * Test the property 'numberItem'
      */
     @Test
-    public void numberItemTest() {
+    void numberItemTest() {
         // TODO: test numberItem
     }
 
@@ -60,7 +60,7 @@ public class TypeHolderExampleTest {
      * Test the property 'floatItem'
      */
     @Test
-    public void floatItemTest() {
+    void floatItemTest() {
         // TODO: test floatItem
     }
 
@@ -68,7 +68,7 @@ public class TypeHolderExampleTest {
      * Test the property 'integerItem'
      */
     @Test
-    public void integerItemTest() {
+    void integerItemTest() {
         // TODO: test integerItem
     }
 
@@ -76,7 +76,7 @@ public class TypeHolderExampleTest {
      * Test the property 'boolItem'
      */
     @Test
-    public void boolItemTest() {
+    void boolItemTest() {
         // TODO: test boolItem
     }
 
@@ -84,7 +84,7 @@ public class TypeHolderExampleTest {
      * Test the property 'arrayItem'
      */
     @Test
-    public void arrayItemTest() {
+    void arrayItemTest() {
         // TODO: test arrayItem
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/UserTest.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 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
     }
 
@@ -40,7 +40,7 @@ public class UserTest {
      * Test the property 'id'
      */
     @Test
-    public void idTest() {
+    void idTest() {
         // TODO: test id
     }
 
@@ -48,7 +48,7 @@ public class UserTest {
      * Test the property 'username'
      */
     @Test
-    public void usernameTest() {
+    void usernameTest() {
         // TODO: test username
     }
 
@@ -56,7 +56,7 @@ public class UserTest {
      * Test the property 'firstName'
      */
     @Test
-    public void firstNameTest() {
+    void firstNameTest() {
         // TODO: test firstName
     }
 
@@ -64,7 +64,7 @@ public class UserTest {
      * Test the property 'lastName'
      */
     @Test
-    public void lastNameTest() {
+    void lastNameTest() {
         // TODO: test lastName
     }
 
@@ -72,7 +72,7 @@ public class UserTest {
      * Test the property 'email'
      */
     @Test
-    public void emailTest() {
+    void emailTest() {
         // TODO: test email
     }
 
@@ -80,7 +80,7 @@ public class UserTest {
      * Test the property 'password'
      */
     @Test
-    public void passwordTest() {
+    void passwordTest() {
         // TODO: test password
     }
 
@@ -88,7 +88,7 @@ public class UserTest {
      * Test the property 'phone'
      */
     @Test
-    public void phoneTest() {
+    void phoneTest() {
         // TODO: test phone
     }
 
@@ -96,7 +96,7 @@ public class UserTest {
      * Test the property 'userStatus'
      */
     @Test
-    public void userStatusTest() {
+    void userStatusTest() {
         // TODO: test userStatus
     }
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/model/XmlItemTest.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 XmlItem
  */
-public class XmlItemTest {
+class XmlItemTest {
     private final XmlItem model = new XmlItem();
 
     /**
      * Model tests for XmlItem
      */
     @Test
-    public void testXmlItem() {
+    void testXmlItem() {
         // TODO: test XmlItem
     }
 
@@ -44,7 +44,7 @@ public class XmlItemTest {
      * Test the property 'attributeString'
      */
     @Test
-    public void attributeStringTest() {
+    void attributeStringTest() {
         // TODO: test attributeString
     }
 
@@ -52,7 +52,7 @@ public class XmlItemTest {
      * Test the property 'attributeNumber'
      */
     @Test
-    public void attributeNumberTest() {
+    void attributeNumberTest() {
         // TODO: test attributeNumber
     }
 
@@ -60,7 +60,7 @@ public class XmlItemTest {
      * Test the property 'attributeInteger'
      */
     @Test
-    public void attributeIntegerTest() {
+    void attributeIntegerTest() {
         // TODO: test attributeInteger
     }
 
@@ -68,7 +68,7 @@ public class XmlItemTest {
      * Test the property 'attributeBoolean'
      */
     @Test
-    public void attributeBooleanTest() {
+    void attributeBooleanTest() {
         // TODO: test attributeBoolean
     }
 
@@ -76,7 +76,7 @@ public class XmlItemTest {
      * Test the property 'wrappedArray'
      */
     @Test
-    public void wrappedArrayTest() {
+    void wrappedArrayTest() {
         // TODO: test wrappedArray
     }
 
@@ -84,7 +84,7 @@ public class XmlItemTest {
      * Test the property 'nameString'
      */
     @Test
-    public void nameStringTest() {
+    void nameStringTest() {
         // TODO: test nameString
     }
 
@@ -92,7 +92,7 @@ public class XmlItemTest {
      * Test the property 'nameNumber'
      */
     @Test
-    public void nameNumberTest() {
+    void nameNumberTest() {
         // TODO: test nameNumber
     }
 
@@ -100,7 +100,7 @@ public class XmlItemTest {
      * Test the property 'nameInteger'
      */
     @Test
-    public void nameIntegerTest() {
+    void nameIntegerTest() {
         // TODO: test nameInteger
     }
 
@@ -108,7 +108,7 @@ public class XmlItemTest {
      * Test the property 'nameBoolean'
      */
     @Test
-    public void nameBooleanTest() {
+    void nameBooleanTest() {
         // TODO: test nameBoolean
     }
 
@@ -116,7 +116,7 @@ public class XmlItemTest {
      * Test the property 'nameArray'
      */
     @Test
-    public void nameArrayTest() {
+    void nameArrayTest() {
         // TODO: test nameArray
     }
 
@@ -124,7 +124,7 @@ public class XmlItemTest {
      * Test the property 'nameWrappedArray'
      */
     @Test
-    public void nameWrappedArrayTest() {
+    void nameWrappedArrayTest() {
         // TODO: test nameWrappedArray
     }
 
@@ -132,7 +132,7 @@ public class XmlItemTest {
      * Test the property 'prefixString'
      */
     @Test
-    public void prefixStringTest() {
+    void prefixStringTest() {
         // TODO: test prefixString
     }
 
@@ -140,7 +140,7 @@ public class XmlItemTest {
      * Test the property 'prefixNumber'
      */
     @Test
-    public void prefixNumberTest() {
+    void prefixNumberTest() {
         // TODO: test prefixNumber
     }
 
@@ -148,7 +148,7 @@ public class XmlItemTest {
      * Test the property 'prefixInteger'
      */
     @Test
-    public void prefixIntegerTest() {
+    void prefixIntegerTest() {
         // TODO: test prefixInteger
     }
 
@@ -156,7 +156,7 @@ public class XmlItemTest {
      * Test the property 'prefixBoolean'
      */
     @Test
-    public void prefixBooleanTest() {
+    void prefixBooleanTest() {
         // TODO: test prefixBoolean
     }
 
@@ -164,7 +164,7 @@ public class XmlItemTest {
      * Test the property 'prefixArray'
      */
     @Test
-    public void prefixArrayTest() {
+    void prefixArrayTest() {
         // TODO: test prefixArray
     }
 
@@ -172,7 +172,7 @@ public class XmlItemTest {
      * Test the property 'prefixWrappedArray'
      */
     @Test
-    public void prefixWrappedArrayTest() {
+    void prefixWrappedArrayTest() {
         // TODO: test prefixWrappedArray
     }
 
@@ -180,7 +180,7 @@ public class XmlItemTest {
      * Test the property 'namespaceString'
      */
     @Test
-    public void namespaceStringTest() {
+    void namespaceStringTest() {
         // TODO: test namespaceString
     }
 
@@ -188,7 +188,7 @@ public class XmlItemTest {
      * Test the property 'namespaceNumber'
      */
     @Test
-    public void namespaceNumberTest() {
+    void namespaceNumberTest() {
         // TODO: test namespaceNumber
     }
 
@@ -196,7 +196,7 @@ public class XmlItemTest {
      * Test the property 'namespaceInteger'
      */
     @Test
-    public void namespaceIntegerTest() {
+    void namespaceIntegerTest() {
         // TODO: test namespaceInteger
     }
 
@@ -204,7 +204,7 @@ public class XmlItemTest {
      * Test the property 'namespaceBoolean'
      */
     @Test
-    public void namespaceBooleanTest() {
+    void namespaceBooleanTest() {
         // TODO: test namespaceBoolean
     }
 
@@ -212,7 +212,7 @@ public class XmlItemTest {
      * Test the property 'namespaceArray'
      */
     @Test
-    public void namespaceArrayTest() {
+    void namespaceArrayTest() {
         // TODO: test namespaceArray
     }
 
@@ -220,7 +220,7 @@ public class XmlItemTest {
      * Test the property 'namespaceWrappedArray'
      */
     @Test
-    public void namespaceWrappedArrayTest() {
+    void namespaceWrappedArrayTest() {
         // TODO: test namespaceWrappedArray
     }
 
@@ -228,7 +228,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsString'
      */
     @Test
-    public void prefixNsStringTest() {
+    void prefixNsStringTest() {
         // TODO: test prefixNsString
     }
 
@@ -236,7 +236,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsNumber'
      */
     @Test
-    public void prefixNsNumberTest() {
+    void prefixNsNumberTest() {
         // TODO: test prefixNsNumber
     }
 
@@ -244,7 +244,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsInteger'
      */
     @Test
-    public void prefixNsIntegerTest() {
+    void prefixNsIntegerTest() {
         // TODO: test prefixNsInteger
     }
 
@@ -252,7 +252,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsBoolean'
      */
     @Test
-    public void prefixNsBooleanTest() {
+    void prefixNsBooleanTest() {
         // TODO: test prefixNsBoolean
     }
 
@@ -260,7 +260,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsArray'
      */
     @Test
-    public void prefixNsArrayTest() {
+    void prefixNsArrayTest() {
         // TODO: test prefixNsArray
     }
 
@@ -268,7 +268,7 @@ public class XmlItemTest {
      * Test the property 'prefixNsWrappedArray'
      */
     @Test
-    public void prefixNsWrappedArrayTest() {
+    void prefixNsWrappedArrayTest() {
         // TODO: test prefixNsWrappedArray
     }
 

samples/client/petstore/java/okhttp-gson-3.1/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-3.1/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-3.1/pom.xml

@@ -339,7 +339,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson-awsv4signature/build.gradle

@@ -119,9 +119,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-awsv4signature/build.sbt

@@ -23,7 +23,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-awsv4signature/pom.xml

@@ -344,7 +344,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson-dynamicOperations/build.gradle

@@ -119,9 +119,9 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.30'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-dynamicOperations/build.sbt

@@ -23,7 +23,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-dynamicOperations/pom.xml

@@ -344,7 +344,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson-group-parameter/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-group-parameter/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-group-parameter/pom.xml

@@ -339,7 +339,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson-nullable-required/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-nullable-required/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-nullable-required/pom.xml

@@ -339,7 +339,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-parcelableModel/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml

@@ -346,7 +346,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson-swagger1/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-swagger1/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-swagger1/pom.xml

@@ -345,7 +345,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson-swagger2/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson-swagger2/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson-swagger2/pom.xml

@@ -345,7 +345,7 @@
         <commons-lang3-version>3.14.0</commons-lang3-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <junit-version>5.10.0</junit-version>
+        <junit-version>5.10.2</junit-version>
         <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
         <javax.ws.rs-api-version>2.1.1</javax.ws.rs-api-version>
         <jsr311-api-version>1.1.1</jsr311-api-version>

samples/client/petstore/java/okhttp-gson/build.gradle

@@ -118,9 +118,9 @@ dependencies {
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
 }
 
 javadoc {

samples/client/petstore/java/okhttp-gson/build.sbt

@@ -22,7 +22,7 @@ lazy val root = (project in file(".")).
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.10.2" % "test",
       "com.novocode" % "junit-interface" % "0.10" % "test",
       "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java

@@ -11,8 +11,8 @@ import org.openapitools.client.auth.*;
 import java.math.BigDecimal;
 
 import org.openapitools.client.model.*;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ClientTest {
     ApiClient apiClient;
@@ -48,7 +48,7 @@ public class ClientTest {
         model2.setArrayArrayNumber(new ArrayList<List<BigDecimal>>());
         model2.getArrayArrayNumber().add(arrayArrayNumber2);
 
-        Assert.assertTrue(model2.equals(model));
+        Assertions.assertTrue(model2.equals(model));
     }
 
     /**
@@ -65,6 +65,6 @@ public class ClientTest {
         model2.setId(1029L);
         model2.setName("Dog");
 
-        Assert.assertTrue(model.equals(model2));
+        Assertions.assertTrue(model.equals(model2));
     }
 }