Merge branch 'master' into cleanup-template-management

* master: [PS] Refactor the http signing auth with ecdsa support (OpenAPITools#6397) [Rust Server] Hyper 0.13 + Async/Await support (OpenAPITools#6244) [Rust] set supportAsync to true as the default (OpenAPITools#6480) [php-symfony] Set required PHP version ^7.1.3 (OpenAPITools#6181) update doc [csharp] Rename netstandard to netstandard1.3 (OpenAPITools#6460) feat: support deprecated parameters for typescript-axios generator (OpenAPITools#6475) [REQ][typescript-axios] useSingleRequestParameter should mark parameter optional if all properties are optional (OpenAPITools#6477) better struct alias in rust (OpenAPITools#6470) Migrate Go server samples to OAS 3 only (OpenAPITools#6471) [Rust][reqwest] add async support (OpenAPITools#6464) [codegen][python-experimental] Composed schema with additionalProperties (OpenAPITools#6290) [Java] Decommission Retrofit 1.x support (OpenAPITools#6447) remove scala oas3 samples (OpenAPITools#6446) [Java][jersey2] Fix RuntimeException when HTTP signature parameters are not configured (OpenAPITools#6457) [Java][jersey2] Improve http signature code comments (OpenAPITools#6463) [typescript-angular] drop support of angular below 6.0.0 (OpenAPITools#6360) [cli] new 'author template' command (OpenAPITools#6441) python-experimental updates ancestor + adds descendant discriminator tests (OpenAPITools#6417)
jimschubert · May 30, 2020 · 5166440 · 5166440
2 parents 9a982d4 + 8480706
commit 5166440
Show file tree

Hide file tree

Showing 1,105 changed files with 19,712 additions and 60,018 deletions.
diff --git a/bin/csharp-petstore-all.sh b/bin/csharp-petstore-all.sh
@@ -6,7 +6,7 @@
 # C# Petstore API client with PropertyChanged
 ./bin/csharp-property-changed-petstore.sh
 
-# C# Petstore API client (v5.0 for .net standarnd 1.3+)
+# C# Petstore API client (.net standarnd 1.3+)
 ./bin/csharp-petstore-net-standard.sh
 
 # C# Petstore API client (.NET 4.0)

diff --git a/bin/csharp-petstore-net-standard.json b/bin/csharp-petstore-net-standard.json
@@ -1,3 +1,3 @@
 {
-    "targetFramework": "v5.0"
+    "targetFramework": "netstandard1.3"
 }
diff --git a/bin/go-gin-petstore-server.sh b/bin/go-gin-petstore-server.sh
@@ -25,7 +25,7 @@ then
   mvn -B clean package
 fi
 
-SPEC="modules/openapi-generator/src/test/resources/2_0/petstore.yaml"
+SPEC="modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
 GENERATOR="go-gin-server"
 STUB_DIR="samples/server/petstore/go-gin-api-server"
 

diff --git a/bin/go-petstore-server.sh b/bin/go-petstore-server.sh
@@ -25,7 +25,7 @@ then
   mvn -B clean package
 fi
 
-SPEC="modules/openapi-generator/src/test/resources/2_0/petstore.yaml"
+SPEC="modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
 GENERATOR="go-server"
 STUB_DIR="samples/server/petstore/go-api-server"
 

diff --git a/bin/java-petstore-all.sh b/bin/java-petstore-all.sh
@@ -14,7 +14,6 @@
 ./bin/java-petstore-resteasy.sh
 ./bin/java-petstore-resttemplate-withxml.sh
 ./bin/java-petstore-resttemplate.sh
-./bin/java-petstore-retrofit.sh
 ./bin/java-petstore-retrofit2-play24.sh
 ./bin/java-petstore-retrofit2-play25.sh
 ./bin/java-petstore-retrofit2-play26.sh

diff --git a/bin/java-petstore-retrofit.json b/bin/java-petstore-retrofit.json
diff --git a/bin/java-petstore-retrofit.sh b/bin/java-petstore-retrofit.sh
diff --git a/bin/python-experimental-petstore.sh b/bin/python-experimental-petstore.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/python -i modules/openapi-generator/src/test/resources/2_0/python-client-experimental/petstore-with-fake-endpoints-models-for-testing.yaml -g python-experimental -o samples/client/petstore/python-experimental --additional-properties packageName=petstore_api $@"
+ags="generate -t modules/openapi-generator/src/main/resources/python -i modules/openapi-generator/src/test/resources/2_0/python-client-experimental/petstore-with-fake-endpoints-models-for-testing.yaml -g python-experimental -o samples/client/petstore/python-experimental --additional-properties packageName=petstore_api --additional-properties disallowAdditionalPropertiesIfNotPresent=true $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/typescript-angular-v2-petstore.sh → bin/rust-petstore-reqwest-async.sh b/bin/typescript-angular-v2-petstore.sh → bin/rust-petstore-reqwest-async.sh
@@ -26,7 +26,7 @@ then
 fi
 
 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-angular -o samples/client/petstore/typescript-angular-v2/default --additional-properties ngVersion=2 $@"
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties $@"
+ags="generate -t modules/openapi-generator/src/main/resources/rust -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g rust --library reqwest -o samples/client/petstore/rust/reqwest/petstore-async --additional-properties supportAsync=true,packageName=petstore-reqwest-async $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/rust-petstore.sh b/bin/rust-petstore.sh
@@ -40,7 +40,7 @@ for spec_path in \
                    --input-spec $spec_path
                    --generator-name rust
                    --output samples/client/petstore/rust/$library/$spec
-                   --additional-properties packageName=${spec}-${library}
+                   --additional-properties packageName=${spec}-${library},supportAsync=false
                    --library=$library $@"
     java ${JAVA_OPTS} -jar ${executable} ${args} || exit 1
   done

diff --git a/bin/typescript-angular-petstore-all.sh b/bin/typescript-angular-petstore-all.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-./bin/typescript-angular-v2-petstore.sh
-./bin/typescript-angular-v2-petstore-with-npm.sh
-./bin/typescript-angular-v2-petstore-interfaces.sh
-./bin/typescript-angular-v4-petstore-with-npm.sh
-./bin/typescript-angular-v4.3-petstore-with-npm.sh
 ./bin/typescript-angular-v6-petstore-not-provided-in-root.sh
 ./bin/typescript-angular-v6-petstore-not-provided-in-root-with-npm.sh
 ./bin/typescript-angular-v6-petstore-provided-in-root.sh

diff --git a/bin/typescript-angular-v2-petstore-interfaces.sh b/bin/typescript-angular-v2-petstore-interfaces.sh
diff --git a/bin/typescript-angular-v2-petstore-with-npm.sh b/bin/typescript-angular-v2-petstore-with-npm.sh
diff --git a/bin/typescript-angular-v4-petstore-with-npm.sh b/bin/typescript-angular-v4-petstore-with-npm.sh
diff --git a/bin/typescript-angular-v4.3-petstore-with-npm.sh b/bin/typescript-angular-v4.3-petstore-with-npm.sh
diff --git a/bin/typescript-axios-petstore-with-single-request-parameters.sh b/bin/typescript-axios-petstore-with-single-request-parameters.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-axios -o samples/client/petstore/typescript-axios/builds/with-single-request-parameters --additional-properties useSingleRequestParameter=true $@"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml -g typescript-axios -o samples/client/petstore/typescript-axios/builds/with-single-request-parameters --additional-properties useSingleRequestParameter=true $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/csharp-petstore-all.bat b/bin/windows/csharp-petstore-all.bat
@@ -4,7 +4,7 @@ call .\bin\windows\csharp-petstore.bat
 REM C# Petstore API client with PropertyChanged
 call .\bin\windows\csharp-property-changed-petstore.bat
 
-REM C# Petstore API client (v5.0 for .net standarnd 1.3+)
+REM C# Petstore API client (.net standarnd 1.3+)
 call .\bin\windows\csharp-petstore-netstandard.bat
 
 call .\bin\windows\csharp-dotnet2-petstore.bat

diff --git a/bin/windows/csharp-petstore-netcore-project.bat b/bin/windows/csharp-petstore-netcore-project.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 csharp -o samples\client\petstore\csharp\OpenApiClientNetCoreProject --additional-properties targetFramework=v5.0,packageGuid={67035b31-f8e5-41a4-9673-954035084f7d},netCoreProjectFile=true
+set ags=generate -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\OpenApiClientNetCoreProject --additional-properties targetFramework=netstandard1.3,packageGuid={67035b31-f8e5-41a4-9673-954035084f7d},netCoreProjectFile=true
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/csharp-petstore-netstandard.bat b/bin/windows/csharp-petstore-netstandard.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 csharp -o samples\client\petstore\csharp\OpenApiClientNetStandard --additional-properties targetFramework=v5.0,packageGuid={3AB1F259-1769-484B-9411-84505FCCBD55}
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g csharp -o samples\client\petstore\csharp\OpenApiClientNetStandard --additional-properties targetFramework=netstandard1.3,packageGuid={3AB1F259-1769-484B-9411-84505FCCBD55}
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/go-gin-petstore-server.bat b/bin/windows/go-gin-petstore-server.bat
@@ -6,7 +6,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set SPEC=modules\openapi-generator\src\test\resources\2_0\petstore.yaml
+set SPEC=modules\openapi-generator\src\test\resources\3_0\petstore.yaml
 set GENERATOR=go-gin-server
 set STUB_DIR=samples\server\petstore\go-gin-api-server
 

diff --git a/bin/windows/go-petstore-server.bat b/bin/windows/go-petstore-server.bat
@@ -6,7 +6,7 @@ If Not Exist %executable% (
   mvn clean package
 )
 
-set SPEC=modules\openapi-generator\src\test\resources\2_0\petstore.yaml
+set SPEC=modules\openapi-generator\src\test\resources\3_0\petstore.yaml
 set GENERATOR=go-server
 set STUB_DIR=samples\server\petstore\go-api-server
 

diff --git a/bin/windows/java-petstore-all.bat b/bin/windows/java-petstore-all.bat
@@ -10,7 +10,6 @@ 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-play24.bat
 call .\bin\windows\java-petstore-retrofit2-play25.bat
 call .\bin\windows\java-petstore-retrofit2-play26.bat

diff --git a/bin/windows/java-petstore-retrofit.bat b/bin/windows/java-petstore-retrofit.bat
diff --git a/bin/windows/typescript-angular-petstore-all.bat b/bin/windows/typescript-angular-petstore-all.bat
@@ -1,8 +1,3 @@
-call .\bin\windows\typescript-angular-v2-with-npm.bat
-call .\bin\windows\typescript-angular-v2-interfaces.bat
-call .\bin\windows\typescript-angular-v2.bat
-call .\bin\windows\typescript-angular-v4-with-npm.bat
-call .\bin\windows\typescript-angular-v4.3-with-npm.bat
 call .\bin\windows\typescript-angular-v6-provided-in-root.bat
 call .\bin\windows\typescript-angular-v6-provided-in-root-with-npm.bat
 call .\bin\windows\typescript-angular-v6-not-provided-in-root.bat

diff --git a/bin/windows/typescript-angular-v2-interfaces.bat b/bin/windows/typescript-angular-v2-interfaces.bat
diff --git a/bin/windows/typescript-angular-v2-with-npm.bat b/bin/windows/typescript-angular-v2-with-npm.bat
diff --git a/bin/windows/typescript-angular-v2.bat b/bin/windows/typescript-angular-v2.bat
diff --git a/bin/windows/typescript-angular-v4-with-npm.bat b/bin/windows/typescript-angular-v4-with-npm.bat
diff --git a/bin/windows/typescript-angular-v4.3-with-npm.bat b/bin/windows/typescript-angular-v4.3-with-npm.bat
diff --git a/bin/windows/typescript-axios-petstore-with-single-request-parameters.bat b/bin/windows/typescript-axios-petstore-with-single-request-parameters.bat
@@ -7,6 +7,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.yaml -g typescript-axios -o samples\client\petstore\typescript-axios\builds\with-single-request-parameters --additional-properties useSingleRequestParameter=true
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore-with-operations-without-required-params.yaml -g typescript-axios -o samples\client\petstore\typescript-axios\builds\with-single-request-parameters --additional-properties useSingleRequestParameter=true
 
 java %JAVA_OPTS% -jar %executable% %ags%