Merge branch 'master' into fix-path-provider-bug

* master: decomission nodejs server generator (#6406) [Java] Generate valid code if no Authentication implementations present (#5788)
OpenAPITools · May 23, 2020 · 372109b · 372109b
2 parents 92406b6 + 3d0c4e1
commit 372109b
Show file tree

Hide file tree

Showing 30 changed files with 296 additions and 1,017 deletions.
diff --git a/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java
@@ -122,7 +122,6 @@ public void testGetAuthentications() {
         }
     }
 
-    @Ignore("There is no more basic auth in petstore security definitions")
     @Test
     public void testSetUsernameAndPassword() {
         HttpBasicAuth auth = null;

diff --git a/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java
@@ -122,7 +122,6 @@ public void testGetAuthentications() {
         }
     }
 
-    @Ignore("There is no more basic auth in petstore security definitions")
     @Test
     public void testSetUsernameAndPassword() {
         HttpBasicAuth auth = null;

diff --git a/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java b/CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java
@@ -128,7 +128,6 @@ public void testGetAuthentications() {
         }
     }
 
-    @Ignore("There is no more basic auth in petstore security definitions")
     @Test
     public void testSetUsernameAndPassword() {
         HttpBasicAuth auth = null;

diff --git a/bin/windows/java-petstore-all.bat b/bin/windows/java-petstore-all.bat
@@ -1,24 +1,24 @@
+call .\bin\windows\java-petstore-feign-10x.bat
+call .\bin\windows\java-petstore-feign.bat
+call .\bin\windows\java-petstore-google-api-client.bat
 call .\bin\windows\java-petstore-jersey1.bat
+call .\bin\windows\java-petstore-jersey2-java6.bat
+call .\bin\windows\java-petstore-jersey2-java7.bat
 call .\bin\windows\java-petstore-jersey2-java8.bat
-call .\bin\windows\java-petstore-feign.bat
-call .\bin\windows\java-petstore-feign-10x.bat
 call .\bin\windows\java-petstore-native.bat
-call .\bin\windows\java-petstore-okhttp-gson.bat
 call .\bin\windows\java-petstore-okhttp-gson-parcelable.bat
+call .\bin\windows\java-petstore-okhttp-gson.bat
+call .\bin\windows\java-petstore-rest-assured.bat
+call .\bin\windows\java-petstore-rest-assured-jackson.bat
+call .\bin\windows\java-petstore-resteasy.bat
+call .\bin\windows\java-petstore-resttemplate-withxml.bat
+call .\bin\windows\java-petstore-resttemplate.bat
 call .\bin\windows\java-petstore-retrofit.bat
-call .\bin\windows\java-petstore-retrofit2.bat
-call .\bin\windows\java-petstore-retrofit2rx.bat
-call .\bin\windows\java-petstore-retrofit2rx2.bat
-call .\bin\windows\java8-petstore-jersey2.bat
 call .\bin\windows\java-petstore-retrofit2-play24.bat
 call .\bin\windows\java-petstore-retrofit2-play25.bat
 call .\bin\windows\java-petstore-retrofit2-play26.bat
-call .\bin\windows\java-petstore-jersey2-java6.bat
-call .\bin\windows\java-petstore-resttemplate.bat
-call .\bin\windows\java-petstore-resttemplate-withxml.bat
-call .\bin\windows\java-petstore-webclient.bat
-call .\bin\windows\java-petstore-resteasy.bat
-call .\bin\windows\java-petstore-google-api-client.bat
-call .\bin\windows\java-petstore-rest-assured.bat
-call .\bin\windows\java-petstore-rest-assured-jackson.bat
+call .\bin\windows\java-petstore-retrofit2.bat
+call .\bin\windows\java-petstore-retrofit2rx.bat
+call .\bin\windows\java-petstore-retrofit2rx2.bat
 call .\bin\windows\java-petstore-vertx.bat
+call .\bin\windows\java-petstore-webclient.bat
diff --git a/bin/windows/java-petstore-jersey1.bat b/bin/windows/java-petstore-jersey1.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate --artifact-id petstore-java-client-jersey1 -t modules\openapi-generator\src\main\resources\Java -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -o samples\client\petstore\java\jersey1  --additional-properties hideGenerationTimestamp=true --library=jersey1 --additional-properties useNullForUnknownEnumValue=true
+set ags=generate --artifact-id petstore-java-client-jersey1 -t modules\openapi-generator\src\main\resources\Java -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -o samples\client\petstore\java\jersey1  --additional-properties hideGenerationTimestamp=true --library=jersey1
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore-jersey2-java7.bat b/bin/windows/java-petstore-jersey2-java7.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-jersey2-java7.json -o samples\client\petstore\java\jersey2-java7 --additional-properties hideGenerationTimestamp=true
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore-jersey2-java8.bat b/bin/windows/java-petstore-jersey2-java8.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-jersey2-java7.json -o samples\client\petstore\java\jersey2 --additional-properties hideGenerationTimestamp=true
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-jersey2-java8.json -o samples\client\petstore\java\jersey2-java8 --additional-properties hideGenerationTimestamp=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore-rest-assured.bat b/bin/windows/java-petstore-rest-assured.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\rest-assured -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-rest-assured.json -o samples\client\petstore\java\rest-assured --additional-properties hideGenerationTimestamp=true,booleanGetterPrefix=is
+set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\rest-assured -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-rest-assured.json -o samples\client\petstore\java\rest-assured --additional-properties hideGenerationTimestamp=true --additional-properties useBeanValidation=true --additional-properties performBeanValidation=true --additional-properties booleanGetterPrefix=is
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/java-petstore-webclient.bat b/bin/windows/java-petstore-webclient.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-webclient.json -o samples/client/petstore/java/webclient --additional-properties hideGenerationTimestamp=true
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/docs/generators.md b/docs/generators.md
@@ -103,7 +103,6 @@ The following generators are available:
 * [kotlin-spring](generators/kotlin-spring.md)  
 * [kotlin-vertx (beta)](generators/kotlin-vertx.md)  
 * [nodejs-express-server (beta)](generators/nodejs-express-server.md)  
-* [nodejs-server-deprecated (deprecated)](generators/nodejs-server-deprecated.md)  
 * [php-laravel](generators/php-laravel.md)  
 * [php-lumen](generators/php-lumen.md)  
 * [php-silex-deprecated (deprecated)](generators/php-silex-deprecated.md)  

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -933,7 +933,6 @@ private Map<String, Object> buildSupportFileBundle(List<Object> allOperations, L
                 bundle.put("hasOAuthMethods", true);
                 bundle.put("oauthMethods", ProcessUtils.getOAuthMethods(authMethods));
             }
-
             if (ProcessUtils.hasHttpBearerMethods(authMethods)) {
                 bundle.put("hasHttpBearerMethods", true);
             }
@@ -1480,8 +1479,6 @@ private List<CodegenSecurity> filterAuthMethods(List<CodegenSecurity> authMethod
         return result;
     }
 
-
-
     protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws IOException {
         if (in != null) {
             byte[] bytes = IOUtils.toByteArray(in);
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,6 @@ public void testGetAuthentications() { @@
             }
         }
-        @Ignore("There is no more basic auth in petstore security definitions")
         @Test
         public void testSetUsernameAndPassword() {
             HttpBasicAuth auth = null;
@@ Expand Down @@