loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fixes in security examples (#396)

Browse Source 
* Regenerate "samples/client/petstore-security-test/java/okhttp-gson/"

* Use correct jar

* Fix sh scripts

* Fix path: modules/swagger-codegen => modules/openapi-generator/
This commit is contained in:
Jérémie Bresson 2018-05-09 12:13:30 +02:00 committed by William Cheng
parent 4852434d13
commit 2ee05e12d2
12 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/security/qt5cpp-petstore.sh
View File

@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l qt5cpp -o samples/client/petstore-security-test/qt5cpp" ags="$@ generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l cpp-qt5 -o samples/client/petstore-security-test/qt5cpp"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

2
bin/security/scala-petstore.sh
View File

@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/openapi-generator/src/main/resources/scala -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l scala -o samples/client/petstore-security-test/scala" ags="$@ generate -t modules/openapi-generator/src/main/resources/scala -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l scala-httpclient -o samples/client/petstore-security-test/scala"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

2
bin/security/swift-petstore.sh
View File

@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/openapi-generator/src/main/resources/swift -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l swift -o samples/client/petstore-security-test/swift" ags="$@ generate -t modules/openapi-generator/src/main/resources/swift -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l swift2-deprecated -o samples/client/petstore-security-test/swift"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

4
bin/security/typescript-inversify.sh
View File

@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
APP_DIR=`cd "${APP_DIR}"; pwd` APP_DIR=`cd "${APP_DIR}"; pwd`
fi fi
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar" executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
if [ ! -f "$executable" ] if [ ! -f "$executable" ]
then then
@ -27,6 +27,6 @@ fi
# if you've executed sbt assembly previously it will use that instead. # if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="$@ generate -t modules/swagger-codegen/src/main/resources/typescript-inversify -i modules/swagger-codegen/src/test/resources/2_0/petstore-security-test.yaml -l typescript-inversify -o samples/client/petstore-security-test/typescript-inversify" ags="$@ generate -t modules/openapi-generator/src/main/resources/typescript-inversify -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l typescript-inversify -o samples/client/petstore-security-test/typescript-inversify"
java $JAVA_OPTS -jar $executable $ags java $JAVA_OPTS -jar $executable $ags

4
bin/security/windows/csharp-petstore.bat
View File

@ -1,10 +1,10 @@
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
If Not Exist %executable% ( If Not Exist %executable% (
mvn clean package mvn clean package
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-security-test.yaml -l csharp -o samples/client/petstore-security-test/csharp/SwaggerClient --additional-properties packageGuid={8CE139DF-64BC-4591-85F8-8506C2B67514} set ags=generate -i modules/openapi-generator/src/test/resources/2_0/petstore-security-test.yaml -l csharp -o samples/client/petstore-security-test/csharp/SwaggerClient --additional-properties packageGuid={8CE139DF-64BC-4591-85F8-8506C2B67514}
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

4
bin/security/windows/qt5cpp-petstore.bat
View File

@ -1,10 +1,10 @@
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
If Not Exist %executable% ( If Not Exist %executable% (
mvn clean package mvn clean package
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -t modules/swagger-codegen/src/main/resources/qt5cpp -i modules\swagger-codegen\src\test\resources\2_0\petstore-security-test.yaml -l qt5cpp -o samples\client\petstore-security-test\qt5cpp set ags=generate -t modules/openapi-generator/src/main/resources/qt5cpp -i modules\openapi-generator\src\test\resources\2_0\petstore-security-test.yaml -l qt5cpp -o samples\client\petstore-security-test\qt5cpp
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

4
bin/windows/jaxrs-cxf-petstore-server.bat
View File

@ -1,10 +1,10 @@
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
If Not Exist %executable% ( If Not Exist %executable% (
mvn clean package mvn clean package
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
set ags=generate -t modules\swagger-codegen\src\main\resources\JavaJaxRS\cxf -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-cxf -o samples\server\petstore\jaxrs-cxf -DhideGenerationTimestamp=true set ags=generate -t modules\openapi-generator\src\main\resources\JavaJaxRS\cxf -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-cxf -o samples\server\petstore\jaxrs-cxf -DhideGenerationTimestamp=true
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

4
bin/windows/typescript-fetch-petstore-interfaces.bat
View File

@ -1,12 +1,12 @@
@ECHO OFF @ECHO OFF
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
If Not Exist %executable% ( If Not Exist %executable% (
mvn clean package mvn clean package
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l typescript-fetch -o samples\client\petstore\typescript-fetch\builds\with-interfaces -D withInterfaces=true set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-fetch -o samples\client\petstore\typescript-fetch\builds\with-interfaces -D withInterfaces=true
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

4
bin/windows/typescript-inversify-petstore.bat
View File

@ -1,6 +1,6 @@
@ECHO OFF @ECHO OFF
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
If Not Exist %executable% ( If Not Exist %executable% (
mvn clean package mvn clean package
@ -9,6 +9,6 @@ If Not Exist %executable% (
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
echo echo
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l typescript-inversify -o samples\client\petstore\typescript-inversify\builds\default set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-inversify -o samples\client\petstore\typescript-inversify\builds\default
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

4
bin/windows/typescript-inversify.bat
View File

@ -1,10 +1,10 @@
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
If Not Exist %executable% ( If Not Exist %executable% (
mvn clean package mvn clean package
) )
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l typescript-inversify -o samples\client\petstore\typescript-inversify set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l typescript-inversify -o samples\client\petstore\typescript-inversify
java %JAVA_OPTS% -jar %executable% %ags% java %JAVA_OPTS% -jar %executable% %ags%

6
samples/client/petstore-security-test/java/okhttp-gson/README.md
View File

@ -1,6 +1,6 @@
# petstore-okhttp-gson # petstore-okhttp-gson
Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r
- API version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r - API version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end --
@ -84,7 +84,7 @@ public class FakeApiExample {
public static void main(String[] args) { public static void main(String[] args) {
FakeApi apiInstance = new FakeApi(); FakeApi apiInstance = new FakeApi();
ERRORUNKNOWN UNKNOWN_BASE_TYPE = new UNKNOWN_BASE_TYPE(); // ERRORUNKNOWN | Object UNKNOWN_BASE_TYPE = new UNKNOWN_BASE_TYPE(); // Object |
try { try {
apiInstance.testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE); apiInstance.testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE);
} catch (ApiException e) { } catch (ApiException e) {
@ -135,5 +135,5 @@ It's recommended to create an instance of `ApiClient` per thread in a multithrea
## Author ## Author
apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r

7
samples/client/petstore-security-test/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java
View File

@ -1,9 +1,9 @@
/* /*
* Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r * OpenAPI Petstore *_/ ' \" =end -- \\r\\n \\n \\r
* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end -- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ *_/ ' \" =end --
* *
* OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
* Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r * Contact: something@something.abc *_/ ' \" =end -- \\r\\n \\n \\r
* *
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
* https://openapi-generator.tech * https://openapi-generator.tech
@ -14,7 +14,6 @@
package org.openapitools.client.api; package org.openapitools.client.api;
import org.openapitools.client.ApiException; import org.openapitools.client.ApiException;
import org.openapitools.client.model.ERRORUNKNOWN;
import org.junit.Test; import org.junit.Test;
import org.junit.Ignore; import org.junit.Ignore;
@ -42,7 +41,7 @@ public class FakeApiTest {
*/ */
@Test @Test
public void testCodeInjectEndRnNRTest() throws ApiException { public void testCodeInjectEndRnNRTest() throws ApiException {
ERRORUNKNOWN UNKNOWN_BASE_TYPE = null; Object UNKNOWN_BASE_TYPE = null;
api.testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE); api.testCodeInjectEndRnNR(UNKNOWN_BASE_TYPE);
// TODO: test validations // TODO: test validations