Skip to content

Commit 372109b

Browse files
jimschubertjimschubert
committed
Merge branch 'master' into fix-path-provider-bug
* master: decomission nodejs server generator (#6406) [Java] Generate valid code if no Authentication implementations present (#5788)
2 parents 92406b6 + 3d0c4e1 commit 372109b

File tree

30 files changed

+296
-1017
lines changed

30 files changed

+296
-1017
lines changed

‎CI/samples.ci/client/petstore/java/test-manual/jersey1/ApiClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public void testGetAuthentications() {
122122
}
123123
}
124124

125-
@Ignore("There is no more basic auth in petstore security definitions")
126125
@Test
127126
public void testSetUsernameAndPassword() {
128127
HttpBasicAuth auth = null;

‎CI/samples.ci/client/petstore/java/test-manual/jersey2/ApiClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public void testGetAuthentications() {
122122
}
123123
}
124124

125-
@Ignore("There is no more basic auth in petstore security definitions")
126125
@Test
127126
public void testSetUsernameAndPassword() {
128127
HttpBasicAuth auth = null;

‎CI/samples.ci/client/petstore/java/test-manual/resttemplate/ApiClientTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ public void testGetAuthentications() {
128128
}
129129
}
130130

131-
@Ignore("There is no more basic auth in petstore security definitions")
132131
@Test
133132
public void testSetUsernameAndPassword() {
134133
HttpBasicAuth auth = null;

‎bin/windows/java-petstore-all.bat

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1+
call .\bin\windows\java-petstore-feign-10x.bat
2+
call .\bin\windows\java-petstore-feign.bat
3+
call .\bin\windows\java-petstore-google-api-client.bat
14
call .\bin\windows\java-petstore-jersey1.bat
5+
call .\bin\windows\java-petstore-jersey2-java6.bat
6+
call .\bin\windows\java-petstore-jersey2-java7.bat
27
call .\bin\windows\java-petstore-jersey2-java8.bat
3-
call .\bin\windows\java-petstore-feign.bat
4-
call .\bin\windows\java-petstore-feign-10x.bat
58
call .\bin\windows\java-petstore-native.bat
6-
call .\bin\windows\java-petstore-okhttp-gson.bat
79
call .\bin\windows\java-petstore-okhttp-gson-parcelable.bat
10+
call .\bin\windows\java-petstore-okhttp-gson.bat
11+
call .\bin\windows\java-petstore-rest-assured.bat
12+
call .\bin\windows\java-petstore-rest-assured-jackson.bat
13+
call .\bin\windows\java-petstore-resteasy.bat
14+
call .\bin\windows\java-petstore-resttemplate-withxml.bat
15+
call .\bin\windows\java-petstore-resttemplate.bat
816
call .\bin\windows\java-petstore-retrofit.bat
9-
call .\bin\windows\java-petstore-retrofit2.bat
10-
call .\bin\windows\java-petstore-retrofit2rx.bat
11-
call .\bin\windows\java-petstore-retrofit2rx2.bat
12-
call .\bin\windows\java8-petstore-jersey2.bat
1317
call .\bin\windows\java-petstore-retrofit2-play24.bat
1418
call .\bin\windows\java-petstore-retrofit2-play25.bat
1519
call .\bin\windows\java-petstore-retrofit2-play26.bat
16-
call .\bin\windows\java-petstore-jersey2-java6.bat
17-
call .\bin\windows\java-petstore-resttemplate.bat
18-
call .\bin\windows\java-petstore-resttemplate-withxml.bat
19-
call .\bin\windows\java-petstore-webclient.bat
20-
call .\bin\windows\java-petstore-resteasy.bat
21-
call .\bin\windows\java-petstore-google-api-client.bat
22-
call .\bin\windows\java-petstore-rest-assured.bat
23-
call .\bin\windows\java-petstore-rest-assured-jackson.bat
20+
call .\bin\windows\java-petstore-retrofit2.bat
21+
call .\bin\windows\java-petstore-retrofit2rx.bat
22+
call .\bin\windows\java-petstore-retrofit2rx2.bat
2423
call .\bin\windows\java-petstore-vertx.bat
24+
call .\bin\windows\java-petstore-webclient.bat

‎bin/windows/java-petstore-jersey1.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ If Not Exist %executable% (
55
)
66

77
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8-
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
8+
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
99

1010
java %JAVA_OPTS% -jar %executable% %ags%

‎bin/windows/java-petstore-jersey2-java7.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
2+
3+
If Not Exist %executable% (
4+
mvn clean package
5+
)
6+
7+
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8+
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
9+
10+
java %JAVA_OPTS% -jar %executable% %ags%

‎bin/windows/java-petstore-jersey2-java8.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ If Not Exist %executable% (
55
)
66

77
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8-
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
8+
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
99

1010
java %JAVA_OPTS% -jar %executable% %ags%

‎bin/windows/java-petstore-rest-assured.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ If Not Exist %executable% (
55
)
66

77
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8-
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
8+
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
99

1010
java %JAVA_OPTS% -jar %executable% %ags%

‎bin/windows/java-petstore-webclient.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
2+
3+
If Not Exist %executable% (
4+
mvn clean package
5+
)
6+
7+
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
8+
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
9+
10+
java %JAVA_OPTS% -jar %executable% %ags%

‎docs/generators.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ The following generators are available:
103103
* [kotlin-spring](generators/kotlin-spring.md)
104104
* [kotlin-vertx (beta)](generators/kotlin-vertx.md)
105105
* [nodejs-express-server (beta)](generators/nodejs-express-server.md)
106-
* [nodejs-server-deprecated (deprecated)](generators/nodejs-server-deprecated.md)
107106
* [php-laravel](generators/php-laravel.md)
108107
* [php-lumen](generators/php-lumen.md)
109108
* [php-silex-deprecated (deprecated)](generators/php-silex-deprecated.md)

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,6 @@ private Map<String, Object> buildSupportFileBundle(List<Object> allOperations, L
933933
bundle.put("hasOAuthMethods", true);
934934
bundle.put("oauthMethods", ProcessUtils.getOAuthMethods(authMethods));
935935
}
936-
937936
if (ProcessUtils.hasHttpBearerMethods(authMethods)) {
938937
bundle.put("hasHttpBearerMethods", true);
939938
}
@@ -1480,8 +1479,6 @@ private List<CodegenSecurity> filterAuthMethods(List<CodegenSecurity> authMethod
14801479
return result;
14811480
}
14821481

1483-
1484-
14851482
protected File writeInputStreamToFile(String filename, InputStream in, String templateFile) throws IOException {
14861483
if (in != null) {
14871484
byte[] bytes = IOUtils.toByteArray(in);

0 commit comments

Comments
 (0)