Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit 5166440

Browse files
jimschubertjimschubert
committed
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)
2 parents 9a982d4 + 8480706 commit 5166440

File tree

1,105 files changed

+19712
-60018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,105 files changed

+19712
-60018
lines changed

‎bin/csharp-petstore-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# C# Petstore API client with PropertyChanged
77
./bin/csharp-property-changed-petstore.sh
88

9-
# C# Petstore API client (v5.0 for .net standarnd 1.3+)
9+
# C# Petstore API client (.net standarnd 1.3+)
1010
./bin/csharp-petstore-net-standard.sh
1111

1212
# C# Petstore API client (.NET 4.0)

‎bin/csharp-petstore-net-standard.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"targetFramework": "v5.0"
2+
"targetFramework": "netstandard1.3"
33
}

‎bin/go-gin-petstore-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ then
2525
mvn -B clean package
2626
fi
2727

28-
SPEC="modules/openapi-generator/src/test/resources/2_0/petstore.yaml"
28+
SPEC="modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
2929
GENERATOR="go-gin-server"
3030
STUB_DIR="samples/server/petstore/go-gin-api-server"
3131

‎bin/go-petstore-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ then
2525
mvn -B clean package
2626
fi
2727

28-
SPEC="modules/openapi-generator/src/test/resources/2_0/petstore.yaml"
28+
SPEC="modules/openapi-generator/src/test/resources/3_0/petstore.yaml"
2929
GENERATOR="go-server"
3030
STUB_DIR="samples/server/petstore/go-api-server"
3131

‎bin/java-petstore-all.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
./bin/java-petstore-resteasy.sh
1515
./bin/java-petstore-resttemplate-withxml.sh
1616
./bin/java-petstore-resttemplate.sh
17-
./bin/java-petstore-retrofit.sh
1817
./bin/java-petstore-retrofit2-play24.sh
1918
./bin/java-petstore-retrofit2-play25.sh
2019
./bin/java-petstore-retrofit2-play26.sh

‎bin/java-petstore-retrofit.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎bin/java-petstore-retrofit.sh

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎bin/python-experimental-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
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 $@"
30+
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 $@"
3131

3232
java $JAVA_OPTS -jar $executable $ags

‎bin/typescript-angular-v2-petstore.sh renamed to ‎bin/rust-petstore-reqwest-async.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ then
2626
fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
29-
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
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 $@"
29+
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties $@"
30+
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 $@"
3131

3232
java $JAVA_OPTS -jar $executable $ags

‎bin/rust-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ for spec_path in \
4040
--input-spec $spec_path
4141
--generator-name rust
4242
--output samples/client/petstore/rust/$library/$spec
43-
--additional-properties packageName=${spec}-${library}
43+
--additional-properties packageName=${spec}-${library},supportAsync=false
4444
--library=$library $@"
4545
java ${JAVA_OPTS} -jar ${executable} ${args} || exit 1
4646
done

‎bin/typescript-angular-petstore-all.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#!/bin/sh
22

3-
./bin/typescript-angular-v2-petstore.sh
4-
./bin/typescript-angular-v2-petstore-with-npm.sh
5-
./bin/typescript-angular-v2-petstore-interfaces.sh
6-
./bin/typescript-angular-v4-petstore-with-npm.sh
7-
./bin/typescript-angular-v4.3-petstore-with-npm.sh
83
./bin/typescript-angular-v6-petstore-not-provided-in-root.sh
94
./bin/typescript-angular-v6-petstore-not-provided-in-root-with-npm.sh
105
./bin/typescript-angular-v6-petstore-provided-in-root.sh

‎bin/typescript-angular-v2-petstore-interfaces.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎bin/typescript-angular-v2-petstore-with-npm.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎bin/typescript-angular-v4-petstore-with-npm.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎bin/typescript-angular-v4.3-petstore-with-npm.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎bin/typescript-axios-petstore-with-single-request-parameters.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
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 $@"
30+
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 $@"
3131

3232
java $JAVA_OPTS -jar $executable $ags

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ call .\bin\windows\csharp-petstore.bat
44
REM C# Petstore API client with PropertyChanged
55
call .\bin\windows\csharp-property-changed-petstore.bat
66

7-
REM C# Petstore API client (v5.0 for .net standarnd 1.3+)
7+
REM C# Petstore API client (.net standarnd 1.3+)
88
call .\bin\windows\csharp-petstore-netstandard.bat
99

1010
call .\bin\windows\csharp-dotnet2-petstore.bat

‎bin/windows/csharp-petstore-netcore-project.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 csharp -o samples\client\petstore\csharp\OpenApiClientNetCoreProject --additional-properties targetFramework=v5.0,packageGuid={67035b31-f8e5-41a4-9673-954035084f7d},netCoreProjectFile=true
8+
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
99

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

‎bin/windows/csharp-petstore-netstandard.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 csharp -o samples\client\petstore\csharp\OpenApiClientNetStandard --additional-properties targetFramework=v5.0,packageGuid={3AB1F259-1769-484B-9411-84505FCCBD55}
8+
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}
99

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

‎bin/windows/go-gin-petstore-server.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ If Not Exist %executable% (
66
mvn clean package
77
)
88

9-
set SPEC=modules\openapi-generator\src\test\resources\2_0\petstore.yaml
9+
set SPEC=modules\openapi-generator\src\test\resources\3_0\petstore.yaml
1010
set GENERATOR=go-gin-server
1111
set STUB_DIR=samples\server\petstore\go-gin-api-server
1212

‎bin/windows/go-petstore-server.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ If Not Exist %executable% (
66
mvn clean package
77
)
88

9-
set SPEC=modules\openapi-generator\src\test\resources\2_0\petstore.yaml
9+
set SPEC=modules\openapi-generator\src\test\resources\3_0\petstore.yaml
1010
set GENERATOR=go-server
1111
set STUB_DIR=samples\server\petstore\go-api-server
1212

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ call .\bin\windows\java-petstore-rest-assured-jackson.bat
1010
call .\bin\windows\java-petstore-resteasy.bat
1111
call .\bin\windows\java-petstore-resttemplate-withxml.bat
1212
call .\bin\windows\java-petstore-resttemplate.bat
13-
call .\bin\windows\java-petstore-retrofit.bat
1413
call .\bin\windows\java-petstore-retrofit2-play24.bat
1514
call .\bin\windows\java-petstore-retrofit2-play25.bat
1615
call .\bin\windows\java-petstore-retrofit2-play26.bat

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

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎bin/windows/typescript-angular-petstore-all.bat

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
call .\bin\windows\typescript-angular-v2-with-npm.bat
2-
call .\bin\windows\typescript-angular-v2-interfaces.bat
3-
call .\bin\windows\typescript-angular-v2.bat
4-
call .\bin\windows\typescript-angular-v4-with-npm.bat
5-
call .\bin\windows\typescript-angular-v4.3-with-npm.bat
61
call .\bin\windows\typescript-angular-v6-provided-in-root.bat
72
call .\bin\windows\typescript-angular-v6-provided-in-root-with-npm.bat
83
call .\bin\windows\typescript-angular-v6-not-provided-in-root.bat

‎bin/windows/typescript-angular-v2-interfaces.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎bin/windows/typescript-angular-v2-with-npm.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎bin/windows/typescript-angular-v2.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎bin/windows/typescript-angular-v4-with-npm.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎bin/windows/typescript-angular-v4.3-with-npm.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎bin/windows/typescript-axios-petstore-with-single-request-parameters.bat

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

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

1212
java %JAVA_OPTS% -jar %executable% %ags%

0 commit comments

Comments
 (0)