Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CLI] Initial implementation for batch generation #3789

Merged
merged 25 commits into from
Oct 9, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
62099da
[CLI] Initial implementation for batch generation
jimschubert Aug 28, 2019
473ca5f
Allow for path-relative outputs
jimschubert Sep 7, 2019
d4ea07b
Add batch JSON objects
jimschubert Sep 7, 2019
e374397
write out the output directory in console
jimschubert Sep 7, 2019
68f2d9f
Change outputDir
jimschubert Sep 7, 2019
c6c4d81
Include INFO log about threads used and includes/root
jimschubert Sep 30, 2019
92d7b9f
Merge branch 'master' into batch-generation
jimschubert Sep 30, 2019
d2cd084
[Samples] Regenerate via ensure-up-to-date
jimschubert Sep 30, 2019
b5f16e9
Fixing dart generations
jimschubert Oct 4, 2019
542cc97
Delete stale "swagger" directory
jimschubert Oct 4, 2019
6a0133d
jwt headless in ensure-up-to-date
jimschubert Oct 4, 2019
f32da0e
Rename numberedbin/ci/java generators to match their outputs
jimschubert Oct 4, 2019
777b87c
Include ruby faraday in bin/ci
jimschubert Oct 4, 2019
9a3e954
Regenerate faraday for OAS 2
jimschubert Oct 4, 2019
dbb08af
Ignore csharp test csproj on generate
jimschubert Oct 4, 2019
b71df42
Minor refactoring
jimschubert Oct 5, 2019
28a3c2c
Ensure GlobalSettings.reset()
jimschubert Oct 5, 2019
0b7b5b9
Minor refactoring
jimschubert Oct 5, 2019
5f7b046
Improved thread-safety of ModelUtils
jimschubert Oct 5, 2019
27ada22
Merge branch 'master' into batch-generation
jimschubert Oct 6, 2019
a9ff022
Change dart windows scripts to openapi/openapi-generator
jimschubert Oct 6, 2019
c69726e
Regenerate samples
jimschubert Oct 6, 2019
19bfc69
Regenerate samples
jimschubert Oct 6, 2019
262a413
Include kotlin generation settings from previous contributions from b…
jimschubert Oct 6, 2019
8ecc146
Include kotlin multiplatform in CI samples generation
jimschubert Oct 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bin/ci/apex-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"generatorName": "apex",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/apex",
"templateDir": "modules/openapi-generator/src/main/resources/apex"
}
11 changes: 11 additions & 0 deletions bin/ci/csharp-netcore-petstore-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"generatorName": "csharp-netcore",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/client/petstore/csharp-netcore/OpenAPIClientCore",
"templateDir": "modules/openapi-generator/src/main/resources/csharp-netcore/",
"additionalProperties": {
"packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
"useCompareNetObjects": true,
"targetFramework": "netcoreapp2.0"
}
}
10 changes: 10 additions & 0 deletions bin/ci/csharp-netcore-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "csharp-netcore",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/client/petstore/csharp-netcore/OpenAPIClient",
"templateDir": "modules/openapi-generator/src/main/resources/csharp-netcore/",
"additionalProperties": {
"packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}",
"useCompareNetObjects": true
}
}
8 changes: 8 additions & 0 deletions bin/ci/csharp-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"generatorName": "csharp",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/client/petstore/csharp/OpenAPIClient",
"additionalProperties": {
"packageGuid": "{321C8C3F-0156-40C1-AE42-D59761FB9B6C}"
}
}
10 changes: 10 additions & 0 deletions bin/ci/dart-flutter-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "dart",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart/flutter_petstore/swagger",
"templateDir": "modules/openapi-generator/src/main/resources/dart",
"additionalProperties": {
"hideGenerationTimestamp": true,
"browserClient": false
}
}
10 changes: 10 additions & 0 deletions bin/ci/dart-jaguar-petstore-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "dart-jaguar",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart-jaguar/flutter_petstore/openapi",
"templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
"additionalProperties": {
"hideGenerationTimestamp": true,
"pubName": "openapi"
}
}
11 changes: 11 additions & 0 deletions bin/ci/dart-jaguar-petstore-2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"generatorName": "dart-jaguar",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml",
"outputDir": "samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi",
"templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
"additionalProperties": {
"serialization": "proto",
"hideGenerationTimestamp": true,
"pubName": "openapi"
}
}
11 changes: 11 additions & 0 deletions bin/ci/dart-jaguar-petstore-3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"generatorName": "dart-jaguar",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-proto.yaml",
"outputDir": "samples/client/petstore/dart-jaguar/openapi_proto",
"templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
"additionalProperties": {
"serialization": "proto",
"hideGenerationTimestamp": true,
"pubName": "openapi"
}
}
10 changes: 10 additions & 0 deletions bin/ci/dart-jaguar-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "dart-jaguar",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart-jaguar/openapi",
"templateDir": "modules/openapi-generator/src/main/resources/dart-jaguar",
"additionalProperties": {
"hideGenerationTimestamp": true,
"pubName": "openapi"
}
}
11 changes: 11 additions & 0 deletions bin/ci/dart-petstore-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"generatorName": "dart",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart/openapi-browser-client",
"templateDir": "modules/openapi-generator/src/main/resources/dart",
"additionalProperties": {
"hideGenerationTimestamp": true,
"browserClient": true,
"supportDart2": false
}
}
11 changes: 11 additions & 0 deletions bin/ci/dart-petstore-2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"generatorName": "dart",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart/flutter_petstore/openapi",
"templateDir": "modules/openapi-generator/src/main/resources/dart",
"additionalProperties": {
"hideGenerationTimestamp": true,
"browserClient": false,
"supportDart2": false
}
}
11 changes: 11 additions & 0 deletions bin/ci/dart-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"generatorName": "dart",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart/openapi",
"templateDir": "modules/openapi-generator/src/main/resources/dart",
"additionalProperties": {
"hideGenerationTimestamp": true,
"browserClient": false,
"supportDart2": false
}
}
10 changes: 10 additions & 0 deletions bin/ci/dart2-petstore-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "dart",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart2/openapi-browser-client",
"templateDir": "modules/openapi-generator/src/main/resources/dart",
"additionalProperties": {
"hideGenerationTimestamp": true,
"browserClient": true
}
}
10 changes: 10 additions & 0 deletions bin/ci/dart2-petstore-2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "dart",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart2/flutter_petstore/openapi",
"templateDir": "modules/openapi-generator/src/main/resources/dart",
"additionalProperties": {
"hideGenerationTimestamp": true,
"browserClient": false
}
}
10 changes: 10 additions & 0 deletions bin/ci/dart2-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "dart",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/dart2/openapi",
"templateDir": "modules/openapi-generator/src/main/resources/dart",
"additionalProperties": {
"hideGenerationTimestamp": true,
"browserClient": false
}
}
9 changes: 9 additions & 0 deletions bin/ci/elixir-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"generatorName": "elixir",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/client/petstore/elixir/",
"templateDir": "modules/openapi-generator/src/main/resources/elixir",
"additionalProperties": {
"invokerPackage": "OpenapiPetstore"
}
}
10 changes: 10 additions & 0 deletions bin/ci/go-gin-petstore-server.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "go-gin-server",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/server/petstore/go-gin-api-server",
"templateDir": "modules/openapi-generator/src/main/resources/go-gin-server",
"additionalProperties": {
"packageName": "petstoreserver",
"hideGenerationTimestamp": true
}
}
11 changes: 11 additions & 0 deletions bin/ci/go-petstore-withxml.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"generatorName": "go",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/client/petstore/go/go-petstore-withXml",
"templateDir": "modules/openapi-generator/src/main/resources/go",
"additionalProperties": {
"packageName": "petstore",
"withXml": true,
"withGoCodegenComment": true
}
}
9 changes: 9 additions & 0 deletions bin/ci/go-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"generatorName": "go",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/client/petstore/go/go-petstore",
"templateDir": "modules/openapi-generator/src/main/resources/go",
"additionalProperties": {
"packageName": "petstore"
}
}
9 changes: 9 additions & 0 deletions bin/ci/groovy-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"generatorName": "groovy",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/client/petstore/groovy",
"templateDir": "modules/openapi-generator/src/main/resources/Groovy/",
"additionalProperties": {
"hideGenerationTimestamp": true
}
}
6 changes: 6 additions & 0 deletions bin/ci/haskell-http-client-petstore.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"generatorName": "haskell-http-client",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/client/petstore/haskell-http-client",
"templateDir": "modules/openapi-generator/src/main/resources/haskell-http-client"
}
9 changes: 9 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"generatorName": "jaxrs-cxf-cdi",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/server/petstore/jaxrs-cxf-cdi",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi",
"additionalProperties": {
"hideGenerationTimestamp": true
}
}
9 changes: 9 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-10.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"generatorName": "jaxrs-resteasy-eap",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/server/petstore/jaxrs-resteasy/eap",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap",
"additionalProperties": {
"hideGenerationTimestamp": true
}
}
11 changes: 11 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-11.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"!include": "./bin/jaxrs-resteasy-joda-petstore-server.json",
"artifactId": "jaxrs-resteasy-joda-server",
"generatorName": "jaxrs-resteasy",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/server/petstore/jaxrs-resteasy/joda",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy",
"additionalProperties": {
"hideGenerationTimestamp": true
}
}
9 changes: 9 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-12.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"generatorName": "jaxrs-resteasy",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/server/petstore/jaxrs-resteasy/default",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy",
"additionalProperties": {
"hideGenerationTimestamp": true
}
}
11 changes: 11 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-13.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"artifactId": "jaxrs-spec-interface-petstore-server",
"generatorName": "jaxrs-spec",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/server/petstore/jaxrs-spec-interface",
"additionalProperties": {
"hideGenerationTimestamp": true,
"serializableModel": true,
"interfaceOnly": true
}
}
10 changes: 10 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-14.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"artifactId": "jaxrs-spec-petstore-server",
"generatorName": "jaxrs-spec",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/server/petstore/jaxrs-spec",
"additionalProperties": {
"hideGenerationTimestamp": true,
"serializableModel": true
}
}
12 changes: 12 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-15.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"artifactId": "jaxrs-jersey2-useTags",
"generatorName": "jaxrs-jersey",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/server/petstore/jaxrs/jersey2-useTags",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
"additionalProperties": {
"hideGenerationTimestamp": true,
"serverPort": "8082",
"useTags": true
}
}
10 changes: 10 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-16.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"artifactId": "openapiv3-jaxrs-jersey-petstore-server",
"generatorName": "jaxrs-jersey",
"inputSpec": "modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/server/petstore/jaxrs-jersey",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/",
"additionalProperties": {
"hideGenerationTimestamp": true
}
}
12 changes: 12 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"artifactId": "cxf-annotated-basepath",
"generatorName": "jaxrs-cxf",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/server/petstore/jaxrs-cxf-annotated-base-path",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
"additionalProperties": {
"hideGenerationTimestamp": true,
"useAnnotatedBasePath": true,
"serverPort": "8082"
}
}
12 changes: 12 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"artifactId": "cxf-server-non-spring",
"generatorName": "jaxrs-cxf",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore.yaml",
"outputDir": "samples/server/petstore/jaxrs-cxf-non-spring-app",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
"additionalProperties": {
"hideGenerationTimestamp": true,
"generateNonSpringApplication": true,
"serverPort": "8082"
}
}
10 changes: 10 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"generatorName": "jaxrs-cxf",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"outputDir": "samples/server/petstore/jaxrs-cxf",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS/cxf",
"additionalProperties": {
"hideGenerationTimestamp": true,
"serverPort": "8082"
}
}
12 changes: 12 additions & 0 deletions bin/ci/java-jaxrs-petstore-server-5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"artifactId": "jaxrs-jersey1-server",
"generatorName": "jaxrs-jersey",
"inputSpec": "modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml",
"library": "jersey1",
"outputDir": "samples/server/petstore/jaxrs/jersey1",
"templateDir": "modules/openapi-generator/src/main/resources/JavaJaxRS",
"additionalProperties": {
"hideGenerationTimestamp": true,
"serverPort": "8082"
}
}
Loading