diff --git a/.github/workflows/docker-tag-latest-release.yml b/.github/workflows/docker-tag-latest-release.yml index d380cacbe83..a871f36cead 100644 --- a/.github/workflows/docker-tag-latest-release.yml +++ b/.github/workflows/docker-tag-latest-release.yml @@ -19,7 +19,7 @@ jobs: # This action will "unshallow" so we have all tag info - name: Get latest tag id: tagger - uses: jimschubert/query-tag-action@v1 + uses: jimschubert/query-tag-action@v2 with: include: 'v*' exclude: '*-rc*' diff --git a/.gitignore b/.gitignore index 9ce6c04e156..e72b71f24d1 100644 --- a/.gitignore +++ b/.gitignore @@ -176,12 +176,15 @@ samples/client/petstore/python-tornado/.venv/ # PHP samples/client/petstore/php/OpenAPIClient-php/composer.lock +samples/client/petstore/php-dt/composer.lock +samples/client/petstore/php-dt-modern/composer.lock samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock samples/server/petstore/php-laravel/lib/composer.lock samples/server/petstore/php-lumen/lib/composer.lock samples/server/petstore/php-slim4/composer.lock samples/server/petstore/php-symfony/SymfonyBundle-php/composer.lock samples/server/petstore/php-mezzio-ph/composer.lock +samples/server/petstore/php-mezzio-ph-modern/composer.lock # ts samples/client/petstore/typescript-angular2/npm/npm-debug.log diff --git a/README.md b/README.md index 9bfd915f439..7db649d979a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.2.1`): +[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`5.3.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator) @@ -17,14 +17,6 @@ [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67) [![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/openapitools/openapi-generator/Check%20Supported%20Java%20Versions/master?label=Check%20Supported%20Java%20Versions&logo=github&logoColor=green)](https://github.com/OpenAPITools/openapi-generator/actions?query=workflow%3A%22Check+Supported+Java+Versions%22) - -[5.3.x](https://github.com/OpenAPITools/openapi-generator/tree/5.3.x) (`5.3.x`): -[![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.3.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) -[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.3.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) -[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=5.3.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator) -[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/5.3.x)](https://cloud.drone.io/OpenAPITools/openapi-generator) -[![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/5.3.x?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67) - [6.0.x](https://github.com/OpenAPITools/openapi-generator/tree/6.0.x) (`6.0.x`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/6.0.x.svg?label=Integration%20Test)](https://travis-ci.com/OpenAPITools/openapi-generator) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/6.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) @@ -76,7 +68,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se | | Languages/Frameworks | | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | **API clients** | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.0, .NET Core 2.0, .NET 5.0. Libraries: RestSharp, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client), **k6**, **Kotlin**, **Lua**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (2.x - 11.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs) | -| **Server stubs** | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) | +| **Server stubs** | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/)), **Kotlin** (Spring Boot, Ktor, Vertx), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra) | | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML** | | **Configuration files** | [**Apache2**](https://httpd.apache.org/) | | **Others** | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Protocol Buffer**, **WSDL** | @@ -118,9 +110,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20 | OpenAPI Generator Version | Release Date | Notes | | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- | | 6.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/6.0.0-SNAPSHOT/) | Nov/Dec 2021 | Minor release with breaking changes (no fallback) | -| 5.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.3.0-SNAPSHOT/) | Aug/Sep 2021 | Minor release with breaking changes (with fallback) | -| 5.2.1 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.2.1-SNAPSHOT/) | 09.08.2021 | Patch release (enhancements, bug fixes, etc) | -| [5.2.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.2.0) (latest stable release) | 09.07.2021 | Minor release with breaking changes (with fallback) | +| 5.3.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.3.0-SNAPSHOT/) | Sep/Oct 2021 | Minor release with breaking changes (with fallback) | +| [5.2.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.2.1) (latest stable release) | 016.08.2021 | Patch release (enhancements, bug fixes, etc) | | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1) | 06.05.2020 | Patch release (enhancements, bug fixes, etc) | OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0 @@ -177,16 +168,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository. If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum): -JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar` +JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar` For **Mac/Linux** users: ```sh -wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar -O openapi-generator-cli.jar +wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar -O openapi-generator-cli.jar ``` For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. ``` -Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar +Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar ``` After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage. @@ -411,7 +402,7 @@ openapi-generator-cli version To use a specific version of "openapi-generator-cli" ```sh -openapi-generator-cli version-manager set 5.2.0 +openapi-generator-cli version-manager set 5.2.1 ``` Or install it as dev-dependency: @@ -435,7 +426,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`) -You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.0/openapi-generator-cli-5.2.0.jar) +You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar) To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate` @@ -599,6 +590,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [Cupix](https://www.cupix.com/) - [Datadog](https://www.datadoghq.com) - [DB Systel](https://www.dbsystel.de) +- [Devsupply](https://www.devsupply.com/) - [DocSpring](https://docspring.com/) - [dwango](https://dwango.co.jp/) - [Edge Impulse](https://www.edgeimpulse.com/) @@ -618,6 +610,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [Here](https://developer.here.com/) - [IBM](https://www.ibm.com/) - [Instana](https://www.instana.com) +- [Inquisico](https://inquisico.com) - [JustStar](https://www.juststarinfo.com) - [k6.io](https://k6.io/) - [Klarna](https://www.klarna.com/) @@ -633,6 +626,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in - [MoonVision](https://www.moonvision.io/) - [Myworkout](https://myworkout.com) - [NamSor](https://www.namsor.com/) +- [Neverfail](https://www.neverfail.com/) - [Nokia](https://www.nokia.com/) - [Options Clearing Corporation (OCC)](https://www.theocc.com/) - [Openet](https://www.openet.com/) @@ -902,6 +896,7 @@ Here is a list of template creators: * OCaml: @cgensoul * Perl: @wing328 [:heart:](https://www.patreon.com/wing328) * PHP (Guzzle): @baartosz + * PHP (with Data Transfer): @Articus * PowerShell: @beatcracker * PowerShell (refactored in 5.0.0): @wing328 * Python: @spacether @@ -960,10 +955,10 @@ Here is a list of template creators: * NodeJS Express: @YishTish * PHP Laravel: @renepardon * PHP Lumen: @abcsun + * PHP Mezzio (with Path Handler): @Articus * PHP Slim: @jfastnacht * PHP Slim4: @ybelenko * PHP Symfony: @ksm2 - * PHP Zend Expressive (with Path Handler): @Articus * Python FastAPI: @krjakbrjak * Python AIOHTTP: @Jyhess * Ruby on Rails 5: @zlx diff --git a/bin/configs/csharp-OpenAPIClient.yaml b/bin/configs/csharp-OpenAPIClient.yaml index 23b32d3c9fc..5855eb4a350 100644 --- a/bin/configs/csharp-OpenAPIClient.yaml +++ b/bin/configs/csharp-OpenAPIClient.yaml @@ -1,5 +1,6 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/go-server-required.yaml b/bin/configs/go-server-required.yaml new file mode 100644 index 00000000000..fd90bbbeb83 --- /dev/null +++ b/bin/configs/go-server-required.yaml @@ -0,0 +1,9 @@ +generatorName: go-server +outputDir: samples/server/petstore/go-server-required +inputSpec: modules/openapi-generator/src/test/resources/3_0/server-required.yaml +templateDir: modules/openapi-generator/src/main/resources/go-server +additionalProperties: + hideGenerationTimestamp: "true" + packageName: petstoreserver + addResponseHeaders: true + router: "chi" diff --git a/bin/configs/java-jersey2-8-oas2.yaml b/bin/configs/java-jersey2-8-oas2.yaml index 82df73fc00f..4d3253e23ee 100644 --- a/bin/configs/java-jersey2-8-oas2.yaml +++ b/bin/configs/java-jersey2-8-oas2.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/jersey2-java8 library: jersey2 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-jersey2-java8 hideGenerationTimestamp: true diff --git a/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml b/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml index 8de24bd73e5..f651475259d 100644 --- a/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml +++ b/bin/configs/java-jersey2-extensions-x-auth-id-alias.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8 library: jersey2 inputSpec: modules/openapi-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: openapi3-extensions-x-auth-id-alias-jersey2-java8 hideGenerationTimestamp: true diff --git a/bin/configs/java-micronaut-client.yaml b/bin/configs/java-micronaut-client.yaml new file mode 100644 index 00000000000..31722943924 --- /dev/null +++ b/bin/configs/java-micronaut-client.yaml @@ -0,0 +1,9 @@ +generatorName: java-micronaut-client +outputDir: samples/client/petstore/java-micronaut-client/ +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +additionalProperties: + artifactId: petstore-micronaut + hideGenerationTimestamp: "true" + configureAuth: "false" + build: "all" + test: "spock" diff --git a/bin/configs/java-microprofile-rest-client.yaml b/bin/configs/java-microprofile-rest-client.yaml index 07c1fe806b7..2d9796db540 100644 --- a/bin/configs/java-microprofile-rest-client.yaml +++ b/bin/configs/java-microprofile-rest-client.yaml @@ -2,5 +2,6 @@ generatorName: java outputDir: samples/client/petstore/java/microprofile-rest-client library: microprofile inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: microprofile-rest-client diff --git a/bin/configs/java-resteasy.yaml b/bin/configs/java-resteasy.yaml index 26776e8f08d..a6b09924858 100644 --- a/bin/configs/java-resteasy.yaml +++ b/bin/configs/java-resteasy.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/resteasy library: resteasy inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-resteasy hideGenerationTimestamp: "true" diff --git a/bin/configs/java-resttemplate-withXml.yaml b/bin/configs/java-resttemplate-withXml.yaml index 9f58d152718..c0122422f0a 100644 --- a/bin/configs/java-resttemplate-withXml.yaml +++ b/bin/configs/java-resttemplate-withXml.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/resttemplate-withXml library: resttemplate inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: java8: true withXml: "true" diff --git a/bin/configs/java-resttemplate.yaml b/bin/configs/java-resttemplate.yaml index 0b980323ec3..9c61a34ba90 100644 --- a/bin/configs/java-resttemplate.yaml +++ b/bin/configs/java-resttemplate.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/resttemplate library: resttemplate inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-resttemplate hideGenerationTimestamp: "true" diff --git a/bin/configs/java-retrofit2-play26.yaml b/bin/configs/java-retrofit2-play26.yaml index 5fe367fb79f..b65e8a3a95c 100644 --- a/bin/configs/java-retrofit2-play26.yaml +++ b/bin/configs/java-retrofit2-play26.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/retrofit2-play26 library: retrofit2 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: usePlayWS: "true" enableBuilderSupport: "true" diff --git a/bin/configs/java-webclient-nullable-array.yaml b/bin/configs/java-webclient-nullable-array.yaml new file mode 100644 index 00000000000..24d280bc8cb --- /dev/null +++ b/bin/configs/java-webclient-nullable-array.yaml @@ -0,0 +1,8 @@ +generatorName: java +outputDir: samples/client/petstore/java/webclient-nulable-arrays +library: webclient +inputSpec: modules/openapi-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml +templateDir: modules/openapi-generator/src/main/resources/Java +additionalProperties: + artifactId: petstore-webclient-nullable-arrays + hideGenerationTimestamp: "true" diff --git a/bin/configs/java-webclient.yaml b/bin/configs/java-webclient.yaml index 8569e1e2f85..a78b3f5e47d 100644 --- a/bin/configs/java-webclient.yaml +++ b/bin/configs/java-webclient.yaml @@ -2,6 +2,7 @@ generatorName: java outputDir: samples/client/petstore/java/webclient library: webclient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-webclient hideGenerationTimestamp: "true" diff --git a/bin/configs/jaxrs-resteasy-java8.yaml b/bin/configs/jaxrs-resteasy-java8.yaml new file mode 100644 index 00000000000..bf23076f8c8 --- /dev/null +++ b/bin/configs/jaxrs-resteasy-java8.yaml @@ -0,0 +1,8 @@ +generatorName: jaxrs-resteasy +outputDir: samples/server/petstore/jaxrs-resteasy/java8 +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy +additionalProperties: + artifactId: jaxrs-resteasy-java8-server + hideGenerationTimestamp: "true" + dateLibrary: java8 diff --git a/bin/configs/jaxrs-spec-interface.yaml b/bin/configs/jaxrs-spec-interface.yaml index 2c0b68c410b..ee328043708 100644 --- a/bin/configs/jaxrs-spec-interface.yaml +++ b/bin/configs/jaxrs-spec-interface.yaml @@ -1,6 +1,7 @@ generatorName: jaxrs-spec outputDir: samples/server/petstore/jaxrs-spec-interface inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec additionalProperties: artifactId: jaxrs-spec-interface-petstore-server interfaceOnly: "true" diff --git a/bin/configs/jaxrs-spec.yaml b/bin/configs/jaxrs-spec.yaml index df44fac3717..9e98a9ae5c8 100644 --- a/bin/configs/jaxrs-spec.yaml +++ b/bin/configs/jaxrs-spec.yaml @@ -1,6 +1,7 @@ generatorName: jaxrs-spec outputDir: samples/server/petstore/jaxrs-spec inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec additionalProperties: artifactId: jaxrs-spec-petstore-server serializableModel: "true" diff --git a/bin/configs/kotlin-spring-boot-delegate.yaml b/bin/configs/kotlin-spring-boot-delegate.yaml index 173713600fe..bd6d7956b08 100644 --- a/bin/configs/kotlin-spring-boot-delegate.yaml +++ b/bin/configs/kotlin-spring-boot-delegate.yaml @@ -1,9 +1,9 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot-delegate +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: - library: spring-boot delegatePattern: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/kotlin-spring-boot-reactive.yaml b/bin/configs/kotlin-spring-boot-reactive.yaml index 4730069192b..01b616d2122 100644 --- a/bin/configs/kotlin-spring-boot-reactive.yaml +++ b/bin/configs/kotlin-spring-boot-reactive.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot-reactive +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot reactive: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/kotlin-spring-boot.yaml b/bin/configs/kotlin-spring-boot.yaml index df44a4dfb56..bc8da5b24a3 100644 --- a/bin/configs/kotlin-spring-boot.yaml +++ b/bin/configs/kotlin-spring-boot.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot serializableModel: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/other/android-httpclient.yaml b/bin/configs/other/android-httpclient.yaml index 1d5e23e2272..7a58659d0e3 100644 --- a/bin/configs/other/android-httpclient.yaml +++ b/bin/configs/other/android-httpclient.yaml @@ -1,6 +1,5 @@ generatorName: android outputDir: samples/client/petstore/android/httpclient +library: httpclient inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/android -additionalProperties: - library: httpclient diff --git a/bin/configs/other/android-volley.yaml b/bin/configs/other/android-volley.yaml index 63a3c42a46f..5c479033268 100644 --- a/bin/configs/other/android-volley.yaml +++ b/bin/configs/other/android-volley.yaml @@ -2,5 +2,6 @@ generatorName: android outputDir: samples/client/petstore/android/volley library: volley inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/android additionalProperties: artifactId: petstore-android-volley diff --git a/bin/configs/other/clojure.yaml b/bin/configs/other/clojure.yaml index a34be0c3037..f58c95316cd 100644 --- a/bin/configs/other/clojure.yaml +++ b/bin/configs/other/clojure.yaml @@ -1,3 +1,4 @@ generatorName: clojure outputDir: samples/client/petstore/clojure inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.json +templateDir: modules/openapi-generator/src/main/resources/clojure diff --git a/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml b/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml index 3f07a71ff07..8863620d2ae 100644 --- a/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml +++ b/bin/configs/other/cpp-restbed-server-cpp-restbed.yaml @@ -1,3 +1,4 @@ generatorName: cpp-restbed-server outputDir: samples/server/petstore/cpp-restbed inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server diff --git a/bin/configs/other/csharp-OpenAPIClientNet35.yaml b/bin/configs/other/csharp-OpenAPIClientNet35.yaml index 3851feda103..c308c2ceed9 100644 --- a/bin/configs/other/csharp-OpenAPIClientNet35.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNet35.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNet35 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: v3.5 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/csharp-OpenAPIClientNet40.yaml b/bin/configs/other/csharp-OpenAPIClientNet40.yaml index 57f5cd15245..bd5d7cf794e 100644 --- a/bin/configs/other/csharp-OpenAPIClientNet40.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNet40.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNet40 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: v4.0 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml b/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml index 8c41863eb0e..e9fca548604 100644 --- a/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNetCoreProject.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNetCoreProject inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: netstandard1.3 packageGuid: '{67035b31-f8e5-41a4-9673-954035084f7d}' diff --git a/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml b/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml index d2398251e28..b4f72b50b28 100644 --- a/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml +++ b/bin/configs/other/csharp-OpenAPIClientNetStandard.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNetStandard inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: netstandard1.3 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml b/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml index 1ff167e0536..d5e7325510f 100644 --- a/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml +++ b/bin/configs/other/csharp-OpenAPIClientWithPropertyChanged.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{5CD900DE-8266-412F-A758-28E1F9C623D5}' generatePropertyChanged: "true" diff --git a/bin/configs/other/dynamic-html.yaml b/bin/configs/other/dynamic-html.yaml index 70904c511e1..6f32574d95a 100644 --- a/bin/configs/other/dynamic-html.yaml +++ b/bin/configs/other/dynamic-html.yaml @@ -1,3 +1,4 @@ generatorName: dynamic-html outputDir: samples/documentation/dynamic-html inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/openapi-static diff --git a/bin/configs/other/eiffel.yaml b/bin/configs/other/eiffel.yaml index 07a62662242..53f9468802d 100644 --- a/bin/configs/other/eiffel.yaml +++ b/bin/configs/other/eiffel.yaml @@ -1,3 +1,4 @@ generatorName: eiffel outputDir: samples/client/petstore/eiffel inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Eiffel diff --git a/bin/configs/other/fsharp-functions.yaml b/bin/configs/other/fsharp-functions.yaml index d88cc165284..c96a1707156 100644 --- a/bin/configs/other/fsharp-functions.yaml +++ b/bin/configs/other/fsharp-functions.yaml @@ -1,3 +1,4 @@ generatorName: fsharp-functions outputDir: samples/server/petstore/fsharp-functions inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/fsharp-functions-server diff --git a/bin/configs/other/html.md.yaml b/bin/configs/other/html.md.yaml index 31bb5790c9d..23980658eff 100644 --- a/bin/configs/other/html.md.yaml +++ b/bin/configs/other/html.md.yaml @@ -1,3 +1,4 @@ generatorName: html outputDir: samples/documentation/html.md inputSpec: modules/openapi-generator/src/test/resources/2_0/markdown.yaml +templateDir: modules/openapi-generator/src/main/resources/htmlDocs diff --git a/bin/configs/other/java-vertx-async.yaml b/bin/configs/other/java-vertx-async.yaml index e9eee5e8f64..cbc5b3c1c97 100644 --- a/bin/configs/other/java-vertx-async.yaml +++ b/bin/configs/other/java-vertx-async.yaml @@ -1,6 +1,7 @@ generatorName: java-vertx outputDir: samples/server/petstore/java-vertx/async inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaVertXServer additionalProperties: hideGenerationTimestamp: "true" vertxSwaggerRouterVersion: 1.4.0 diff --git a/bin/configs/other/java-vertx-rx.yaml b/bin/configs/other/java-vertx-rx.yaml index af064e6cbaf..d5dde08656e 100644 --- a/bin/configs/other/java-vertx-rx.yaml +++ b/bin/configs/other/java-vertx-rx.yaml @@ -1,6 +1,7 @@ generatorName: java-vertx outputDir: samples/server/petstore/java-vertx/rx inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaVertXServer additionalProperties: artifactId: java-vertx-rx-server hideGenerationTimestamp: "true" diff --git a/bin/configs/other/javascript-closure-angular.yaml b/bin/configs/other/javascript-closure-angular.yaml index 391b76b3e0b..d911066fc6f 100644 --- a/bin/configs/other/javascript-closure-angular.yaml +++ b/bin/configs/other/javascript-closure-angular.yaml @@ -1,3 +1,4 @@ generatorName: javascript-closure-angular outputDir: samples/client/petstore/javascript-closure-angular inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/Javascript-Closure-Angular diff --git a/bin/configs/other/jaxrs-spec-interface-response.yaml b/bin/configs/other/jaxrs-spec-interface-response.yaml index c3227e7e82e..3e4b7edfb93 100644 --- a/bin/configs/other/jaxrs-spec-interface-response.yaml +++ b/bin/configs/other/jaxrs-spec-interface-response.yaml @@ -1,6 +1,7 @@ generatorName: jaxrs-spec outputDir: samples/server/petstore/jaxrs-spec-interface-response inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec additionalProperties: artifactId: jaxrs-spec-interface-response-petstore-server interfaceOnly: "true" diff --git a/bin/configs/other/jmeter.yaml b/bin/configs/other/jmeter.yaml index fb9e359ffb5..79b5de0e41b 100644 --- a/bin/configs/other/jmeter.yaml +++ b/bin/configs/other/jmeter.yaml @@ -1,3 +1,4 @@ generatorName: jmeter outputDir: samples/client/petstore/jmeter inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/jmeter-client diff --git a/bin/configs/other/k6.yaml b/bin/configs/other/k6.yaml index f1a6c1d5b23..6ac6e692dc2 100644 --- a/bin/configs/other/k6.yaml +++ b/bin/configs/other/k6.yaml @@ -1,3 +1,4 @@ generatorName: k6 outputDir: samples/client/petstore/k6 inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/k6 diff --git a/bin/configs/other/kotlin-spring-boot-modelMutable.yaml b/bin/configs/other/kotlin-spring-boot-modelMutable.yaml index ca3623d059e..772d0dd7f55 100644 --- a/bin/configs/other/kotlin-spring-boot-modelMutable.yaml +++ b/bin/configs/other/kotlin-spring-boot-modelMutable.yaml @@ -1,9 +1,9 @@ generatorName: kotlin-spring outputDir: samples/server/petstore/kotlin-springboot-modelMutable +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: - library: spring-boot serializableModel: "true" swaggerAnnotations: "true" serviceImplementation: "true" diff --git a/bin/configs/other/kotlin-vertx-vertx.yaml b/bin/configs/other/kotlin-vertx-vertx.yaml index 83660b6c78f..64efa733325 100644 --- a/bin/configs/other/kotlin-vertx-vertx.yaml +++ b/bin/configs/other/kotlin-vertx-vertx.yaml @@ -1,5 +1,6 @@ generatorName: kotlin-vertx outputDir: samples/server/petstore/kotlin/vertx inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-vertx-server additionalProperties: modelMutable: "false" diff --git a/bin/configs/other/openapi3/android-httpclient.yaml b/bin/configs/other/openapi3/android-httpclient.yaml index 32e253e0b8d..e06c7a66fae 100644 --- a/bin/configs/other/openapi3/android-httpclient.yaml +++ b/bin/configs/other/openapi3/android-httpclient.yaml @@ -1,6 +1,5 @@ generatorName: android outputDir: samples/client/petstore/android/httpclient +library: httpclient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/android -additionalProperties: - library: httpclient diff --git a/bin/configs/other/openapi3/android-volley.yaml b/bin/configs/other/openapi3/android-volley.yaml index 4903967ef33..eee8b0e3e33 100644 --- a/bin/configs/other/openapi3/android-volley.yaml +++ b/bin/configs/other/openapi3/android-volley.yaml @@ -2,5 +2,6 @@ generatorName: android outputDir: samples/client/petstore/android/volley library: volley inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/android additionalProperties: artifactId: petstore-android-volley diff --git a/bin/configs/other/openapi3/clojure.yaml b/bin/configs/other/openapi3/clojure.yaml index 718503526fc..3c526d5ac10 100644 --- a/bin/configs/other/openapi3/clojure.yaml +++ b/bin/configs/other/openapi3/clojure.yaml @@ -1,3 +1,4 @@ generatorName: clojure outputDir: samples/client/petstore/clojure inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.json +templateDir: modules/openapi-generator/src/main/resources/clojure diff --git a/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml b/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml index 8e653b8a640..d0acbda2d0e 100644 --- a/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml +++ b/bin/configs/other/openapi3/cpp-restbed-server-cpp-restbed.yaml @@ -1,3 +1,4 @@ generatorName: cpp-restbed-server outputDir: samples/server/petstore/cpp-restbed inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/cpp-restbed-server diff --git a/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml b/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml index 84c5cc5af41..24a5fd2b5b3 100644 --- a/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml +++ b/bin/configs/other/openapi3/csharp-OpenAPIClient.yaml @@ -1,5 +1,6 @@ generatorName: csharp outputDir: samples/openapi3/client/petstore/csharp/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml b/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml index 64635629d27..e2dcfd8e9a2 100644 --- a/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml +++ b/bin/configs/other/openapi3/csharp-OpenAPIClientNetStandard.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientNetStandard inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: targetFramework: netstandard1.3 packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}' diff --git a/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml b/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml index 22b05d0dbbe..03034797145 100644 --- a/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml +++ b/bin/configs/other/openapi3/csharp-OpenAPIClientWithPropertyChanged.yaml @@ -1,6 +1,7 @@ generatorName: csharp outputDir: samples/client/petstore/csharp/OpenAPIClientWithPropertyChanged inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp additionalProperties: packageGuid: '{5CD900DE-8266-412F-A758-28E1F9C623D5}' generatePropertyChanged: "true" diff --git a/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml b/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml index fa474d2f56f..428ce87b8b9 100644 --- a/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml +++ b/bin/configs/other/openapi3/csharp-dotnet2-OpenAPIClient.yaml @@ -1,5 +1,6 @@ generatorName: csharp-dotnet2 outputDir: samples/client/petstore/csharp-dotnet2/OpenAPIClientTest/Lib/OpenAPIClient inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/csharp-dotnet2 additionalProperties: hideGenerationTimestamp: "true" diff --git a/bin/configs/other/openapi3/javascript-closure-angular.yaml b/bin/configs/other/openapi3/javascript-closure-angular.yaml index 5654e7ba5cd..dd3caa461ec 100644 --- a/bin/configs/other/openapi3/javascript-closure-angular.yaml +++ b/bin/configs/other/openapi3/javascript-closure-angular.yaml @@ -1,3 +1,4 @@ generatorName: javascript-closure-angular outputDir: samples/client/petstore/javascript-closure-angular inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/Javascript-Closure-Angular diff --git a/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml b/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml index d0a726c9983..791905ed1b0 100644 --- a/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml +++ b/bin/configs/other/openapi3/kotlin-spring-boot-reactive.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/openapi3/server/petstore/kotlin-springboot-reactive +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot reactive: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/other/openapi3/kotlin-spring-boot.yaml b/bin/configs/other/openapi3/kotlin-spring-boot.yaml index a61d999a530..29745bc6065 100644 --- a/bin/configs/other/openapi3/kotlin-spring-boot.yaml +++ b/bin/configs/other/openapi3/kotlin-spring-boot.yaml @@ -1,10 +1,10 @@ generatorName: kotlin-spring outputDir: samples/openapi3/server/petstore/kotlin-springboot +library: spring-boot inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-spring additionalProperties: serviceImplementation: "true" - library: spring-boot serializableModel: "true" swaggerAnnotations: "true" beanValidations: "true" diff --git a/bin/configs/other/openapi3/typescript-angular-default.yaml b/bin/configs/other/openapi3/typescript-angular-default.yaml index b9c8bb045b9..7870bdd592e 100644 --- a/bin/configs/other/openapi3/typescript-angular-default.yaml +++ b/bin/configs/other/openapi3/typescript-angular-default.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v2/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: "2" diff --git a/bin/configs/other/openapi3/typescript-angular-npm.yaml b/bin/configs/other/openapi3/typescript-angular-npm.yaml index 537555aab7e..4234f40f8eb 100644 --- a/bin/configs/other/openapi3/typescript-angular-npm.yaml +++ b/bin/configs/other/openapi3/typescript-angular-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v4.3/npm inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 0.0.1 ngVersion: "4.3" diff --git a/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml b/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml index a0f7e7de655..8b5ce23861b 100644 --- a/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml +++ b/bin/configs/other/openapi3/typescript-angular-with-interfaces.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v2/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: withInterfaces: "true" ngVersion: "2" diff --git a/bin/configs/other/openapi3/typescript-aurelia-default.yaml b/bin/configs/other/openapi3/typescript-aurelia-default.yaml index 9a8fd34ad16..070074e0f64 100644 --- a/bin/configs/other/openapi3/typescript-aurelia-default.yaml +++ b/bin/configs/other/openapi3/typescript-aurelia-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-aurelia outputDir: samples/client/petstore/typescript-aurelia/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-aurelia diff --git a/bin/configs/other/openapi3/typescript-fetch-default.yaml b/bin/configs/other/openapi3/typescript-fetch-default.yaml index d7d60dee382..3e7ffa489e8 100644 --- a/bin/configs/other/openapi3/typescript-fetch-default.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml b/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml index b62b1c17ffa..061f6290ab3 100644 --- a/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml b/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml index 9db3697aba3..3e840041de8 100644 --- a/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-with-interfaces.yaml @@ -1,5 +1,6 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: withInterfaces: "true" diff --git a/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml b/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml index 337538857da..7d00832abe1 100644 --- a/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml +++ b/bin/configs/other/openapi3/typescript-fetch-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/other/openapi3/typescript-inversify.yaml b/bin/configs/other/openapi3/typescript-inversify.yaml index a7b55a50456..6e819934b68 100644 --- a/bin/configs/other/openapi3/typescript-inversify.yaml +++ b/bin/configs/other/openapi3/typescript-inversify.yaml @@ -1,3 +1,4 @@ generatorName: typescript-inversify outputDir: samples/client/petstore/typescript-inversify inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-inversify diff --git a/bin/configs/other/openapi3/typescript-jquery-default.yaml b/bin/configs/other/openapi3/typescript-jquery-default.yaml index 54c50bae2aa..70cd96bea35 100644 --- a/bin/configs/other/openapi3/typescript-jquery-default.yaml +++ b/bin/configs/other/openapi3/typescript-jquery-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery diff --git a/bin/configs/other/openapi3/typescript-jquery-npm.yaml b/bin/configs/other/openapi3/typescript-jquery-npm.yaml index fe44d227ec0..1b842c66aa6 100644 --- a/bin/configs/other/openapi3/typescript-jquery-npm.yaml +++ b/bin/configs/other/openapi3/typescript-jquery-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/npm inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/jquery-typescript-petstore' diff --git a/bin/configs/other/openapi3/typescript-node-default.yaml b/bin/configs/other/openapi3/typescript-node-default.yaml index 5b43b294fad..54db17e7328 100644 --- a/bin/configs/other/openapi3/typescript-node-default.yaml +++ b/bin/configs/other/openapi3/typescript-node-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node diff --git a/bin/configs/other/openapi3/typescript-node-npm.yaml b/bin/configs/other/openapi3/typescript-node-npm.yaml index 15fdb553618..01d5cf687e5 100644 --- a/bin/configs/other/openapi3/typescript-node-npm.yaml +++ b/bin/configs/other/openapi3/typescript-node-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/npm inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/angular2-typescript-petstore' diff --git a/bin/configs/other/scala-akka-http-server.yaml b/bin/configs/other/scala-akka-http-server.yaml index f4c82c9b340..5e0cbcffe66 100644 --- a/bin/configs/other/scala-akka-http-server.yaml +++ b/bin/configs/other/scala-akka-http-server.yaml @@ -1,3 +1,4 @@ generatorName: scala-akka-http-server outputDir: samples/server/petstore/scala-akka-http-server inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/scala-akka-http-server diff --git a/bin/configs/perl-deep_module_test.yaml b/bin/configs/perl-deep_module_test.yaml index 7934a205a08..ea9cd53d886 100644 --- a/bin/configs/perl-deep_module_test.yaml +++ b/bin/configs/perl-deep_module_test.yaml @@ -1,6 +1,7 @@ generatorName: perl outputDir: samples/client/petstore/perl/deep_module_test inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/perl additionalProperties: moduleName: Something::Deep hideGenerationTimestamp: "true" diff --git a/bin/configs/php-dt-modern.yaml b/bin/configs/php-dt-modern.yaml new file mode 100644 index 00000000000..33432079423 --- /dev/null +++ b/bin/configs/php-dt-modern.yaml @@ -0,0 +1,6 @@ +generatorName: php-dt +outputDir: samples/client/petstore/php-dt-modern +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/php-dt-modern +additionalProperties: + modern: "true" diff --git a/bin/configs/php-dt.yaml b/bin/configs/php-dt.yaml new file mode 100644 index 00000000000..6e1cbcccc57 --- /dev/null +++ b/bin/configs/php-dt.yaml @@ -0,0 +1,4 @@ +generatorName: php-dt +outputDir: samples/client/petstore/php-dt +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/php-dt diff --git a/bin/configs/spring-cloud-async.yaml b/bin/configs/spring-cloud-async.yaml index 3275e4ac03e..7f087b9e0bc 100644 --- a/bin/configs/spring-cloud-async.yaml +++ b/bin/configs/spring-cloud-async.yaml @@ -2,7 +2,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-cloud-async library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: async: "true" java8: "true" diff --git a/bin/configs/spring-cloud-no-nullable.yaml b/bin/configs/spring-cloud-no-nullable.yaml index 74d487b947a..498183c1958 100644 --- a/bin/configs/spring-cloud-no-nullable.yaml +++ b/bin/configs/spring-cloud-no-nullable.yaml @@ -2,7 +2,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-cloud-no-nullable library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: petstore-spring-cloud-no-nullable responseWrapper: HystrixCommand diff --git a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml index de1d0567bda..366a1978822 100644 --- a/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml +++ b/bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml @@ -1,8 +1,8 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml outputDir: samples/client/petstore/spring-cloud-spring-pageable -artifactId: spring-cloud-spring-pageable library: spring-cloud +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + artifactId: spring-cloud-spring-pageable hideGenerationTimestamp: 'true' diff --git a/bin/configs/spring-cloud.yaml b/bin/configs/spring-cloud.yaml index 387c9e82a91..79d97acb1f2 100644 --- a/bin/configs/spring-cloud.yaml +++ b/bin/configs/spring-cloud.yaml @@ -2,7 +2,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-cloud library: spring-cloud inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml -templateDir: modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: petstore-spring-cloud responseWrapper: HystrixCommand diff --git a/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml b/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml index be70e14a8dc..bcb362e65db 100644 --- a/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml +++ b/bin/configs/spring-mvc-petstore-server-spring-pageable.yaml @@ -1,8 +1,8 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/spring-mvc-spring-pageable -artifactId: spring-mvc-spring-pageable library: spring-mvc +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + artifactId: spring-mvc-spring-pageable hideGenerationTimestamp: 'true' diff --git a/bin/configs/spring-stubs.yaml b/bin/configs/spring-stubs.yaml index 335fdcb4a7a..8c58e6838ea 100644 --- a/bin/configs/spring-stubs.yaml +++ b/bin/configs/spring-stubs.yaml @@ -1,6 +1,7 @@ generatorName: spring outputDir: samples/client/petstore/spring-stubs inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: artifactId: spring-stubs interfaceOnly: "true" diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml index d098930671b..7e0c9882db5 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml @@ -1,10 +1,10 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8 -artifactId: springboot-spring-pageable-delegatePattern-without-j8 library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true java8: false additionalProperties: + artifactId: springboot-spring-pageable-delegatePattern-without-j8 hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml index 94693ac6d2b..9c96151f04f 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml @@ -1,9 +1,9 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern -artifactId: springboot-spring-pageable-delegatePattern library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring delegatePattern: true additionalProperties: + artifactId: springboot-spring-pageable-delegatePattern hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml index 757e3269513..c87a6776a5f 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml @@ -1,9 +1,9 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable-without-j8 -artifactId: springboot-spring-pageable-withoutj8 library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring java8: false additionalProperties: + artifactId: springboot-spring-pageable-withoutj8 hideGenerationTimestamp: 'true' diff --git a/bin/configs/springboot-petstore-server-spring-pageable.yaml b/bin/configs/springboot-petstore-server-spring-pageable.yaml index 7599c8099ba..ddeaaa6cb72 100644 --- a/bin/configs/springboot-petstore-server-spring-pageable.yaml +++ b/bin/configs/springboot-petstore-server-spring-pageable.yaml @@ -1,8 +1,8 @@ generatorName: spring -templateDir: modules/openapi-generator/src/main/resources/JavaSpring -inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml outputDir: samples/server/petstore/springboot-spring-pageable -artifactId: springboot-spring-pageable library: spring-boot +inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring additionalProperties: + artifactId: springboot-spring-pageable hideGenerationTimestamp: 'true' diff --git a/bin/configs/typescript-angular-default-v6.yaml b/bin/configs/typescript-angular-default-v6.yaml index 664aa59a3c7..36e1dddbe53 100644 --- a/bin/configs/typescript-angular-default-v6.yaml +++ b/bin/configs/typescript-angular-default-v6.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 6.0.0 providedInRoot: "false" diff --git a/bin/configs/typescript-angular-single-request-parameter-v8.yaml b/bin/configs/typescript-angular-single-request-parameter-v8.yaml index c9978cc4aee..33b5f8c8eaf 100644 --- a/bin/configs/typescript-angular-single-request-parameter-v8.yaml +++ b/bin/configs/typescript-angular-single-request-parameter-v8.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 8.0.0 diff --git a/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml index 12874213fa7..e94546bca67 100644 --- a/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v10-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 10.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v10-provided-in-root.yaml b/bin/configs/typescript-angular-v10-provided-in-root.yaml index 3f8a062cb6a..65a195cb466 100644 --- a/bin/configs/typescript-angular-v10-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v10-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 10.0.0 diff --git a/bin/configs/typescript-angular-v11-oneOf.yaml b/bin/configs/typescript-angular-v11-oneOf.yaml index e9d83262ac8..e86a596865c 100644 --- a/bin/configs/typescript-angular-v11-oneOf.yaml +++ b/bin/configs/typescript-angular-v11-oneOf.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v11-oneOf/builds/default inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 11.0.0 diff --git a/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml index c8bbd6e467c..7e3bcbbf3cb 100644 --- a/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v11-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 11.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v11-provided-in-root.yaml b/bin/configs/typescript-angular-v11-provided-in-root.yaml index ec3923714cc..a25b4cbe326 100644 --- a/bin/configs/typescript-angular-v11-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v11-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 11.0.0 diff --git a/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml index 8bb13b8eac7..2c6eee28164 100644 --- a/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v6-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 6.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v6-provided-in-root.yaml b/bin/configs/typescript-angular-v6-provided-in-root.yaml index 36680054672..6fa069cbacf 100644 --- a/bin/configs/typescript-angular-v6-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v6-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 6.0.0 diff --git a/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml index ac73ad65f91..2584cf26cd9 100644 --- a/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v7-not-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v7-not-provided-in-root.yaml b/bin/configs/typescript-angular-v7-not-provided-in-root.yaml index 83d16bcefb1..80d844f912b 100644 --- a/bin/configs/typescript-angular-v7-not-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v7-not-provided-in-root.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 providedInRoot: "false" \ No newline at end of file diff --git a/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml index 6ae7f19ad42..97ab93f8b41 100644 --- a/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v7-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v7-provided-in-root.yaml b/bin/configs/typescript-angular-v7-provided-in-root.yaml index 5a22f83d84a..9b051d4d3b7 100644 --- a/bin/configs/typescript-angular-v7-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v7-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 7.0.0 diff --git a/bin/configs/typescript-angular-v9-provided-in-any.yaml b/bin/configs/typescript-angular-v9-provided-in-any.yaml index 6678f7bb2ec..22bee99305f 100644 --- a/bin/configs/typescript-angular-v9-provided-in-any.yaml +++ b/bin/configs/typescript-angular-v9-provided-in-any.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 9.0.0 providedIn: any diff --git a/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml b/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml index 7a0b1c3df77..df3775b9dd9 100644 --- a/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml +++ b/bin/configs/typescript-angular-v9-provided-in-root-with-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 9.0.0 npmVersion: 1.0.0 diff --git a/bin/configs/typescript-angular-v9-provided-in-root.yaml b/bin/configs/typescript-angular-v9-provided-in-root.yaml index 1bcdebaf797..f32176dc72d 100644 --- a/bin/configs/typescript-angular-v9-provided-in-root.yaml +++ b/bin/configs/typescript-angular-v9-provided-in-root.yaml @@ -1,5 +1,6 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: ngVersion: 9.0.0 diff --git a/bin/configs/typescript-angular-with-npm-v6.yaml b/bin/configs/typescript-angular-with-npm-v6.yaml index c8bcfc48892..450c9282cf7 100644 --- a/bin/configs/typescript-angular-with-npm-v6.yaml +++ b/bin/configs/typescript-angular-with-npm-v6.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 6.0.0 diff --git a/bin/configs/typescript-angular-with-npm-v8.yaml b/bin/configs/typescript-angular-with-npm-v8.yaml index 48849517fcc..bdbd3a156d2 100644 --- a/bin/configs/typescript-angular-with-npm-v8.yaml +++ b/bin/configs/typescript-angular-with-npm-v8.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 8.0.0 diff --git a/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml b/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml index d0c0e1cd0b7..d288257a200 100644 --- a/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml +++ b/bin/configs/typescript-angular-with-prefixed-module-name-v8.yaml @@ -1,6 +1,7 @@ generatorName: typescript-angular outputDir: samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-angular additionalProperties: npmVersion: 1.0.0 ngVersion: 8.0.0 diff --git a/bin/configs/typescript-aurelia-default.yaml b/bin/configs/typescript-aurelia-default.yaml index c0b70a6ad9a..1d93065379c 100644 --- a/bin/configs/typescript-aurelia-default.yaml +++ b/bin/configs/typescript-aurelia-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-aurelia outputDir: samples/client/petstore/typescript-aurelia/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-aurelia diff --git a/bin/configs/typescript-axios-composed-schemas.yaml b/bin/configs/typescript-axios-composed-schemas.yaml index c9bea94bbad..cb51a976cbf 100644 --- a/bin/configs/typescript-axios-composed-schemas.yaml +++ b/bin/configs/typescript-axios-composed-schemas.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/composed-schemas inputSpec: modules/openapi-generator/src/test/resources/3_0/composed-schemas.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-default.yaml b/bin/configs/typescript-axios-default.yaml index 5b3c9488a88..8f04fba8c70 100644 --- a/bin/configs/typescript-axios-default.yaml +++ b/bin/configs/typescript-axios-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-es6-target.yaml b/bin/configs/typescript-axios-es6-target.yaml index 79b61fdaff0..06ff80e7249 100644 --- a/bin/configs/typescript-axios-es6-target.yaml +++ b/bin/configs/typescript-axios-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/typescript-axios-with-complex-headers.yaml b/bin/configs/typescript-axios-with-complex-headers.yaml index c88e7a15d82..e4eeee792ad 100644 --- a/bin/configs/typescript-axios-with-complex-headers.yaml +++ b/bin/configs/typescript-axios-with-complex-headers.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-complex-headers inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml index 1cb364d79ea..65e913fc06e 100644 --- a/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml +++ b/bin/configs/typescript-axios-with-fake-endpoints-models-for-testing-with-http-signature.yaml @@ -1,3 +1,4 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios diff --git a/bin/configs/typescript-axios-with-interfaces.yaml b/bin/configs/typescript-axios-with-interfaces.yaml index 11337d00353..a1d792a5c2a 100644 --- a/bin/configs/typescript-axios-with-interfaces.yaml +++ b/bin/configs/typescript-axios-with-interfaces.yaml @@ -1,5 +1,6 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: withInterfaces: "true" diff --git a/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml b/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml index 48186cc0629..5967dd11e1c 100644 --- a/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml +++ b/bin/configs/typescript-axios-with-npm-version-and-separate-models-and-api.yaml @@ -1,6 +1,7 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: npmVersion: 1.0.0 apiPackage: api.another.level diff --git a/bin/configs/typescript-axios-with-npm-version.yaml b/bin/configs/typescript-axios-with-npm-version.yaml index 8602cac04dd..af18edee14f 100644 --- a/bin/configs/typescript-axios-with-npm-version.yaml +++ b/bin/configs/typescript-axios-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-axios-petstore' diff --git a/bin/configs/typescript-axios-with-single-request-parameters.yaml b/bin/configs/typescript-axios-with-single-request-parameters.yaml index 9239c632938..a06f70ebd6c 100644 --- a/bin/configs/typescript-axios-with-single-request-parameters.yaml +++ b/bin/configs/typescript-axios-with-single-request-parameters.yaml @@ -1,5 +1,6 @@ generatorName: typescript-axios outputDir: samples/client/petstore/typescript-axios/builds/with-single-request-parameters inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-axios additionalProperties: useSingleRequestParameter: "true" diff --git a/bin/configs/typescript-consolidated-composed-schemas.yaml b/bin/configs/typescript-consolidated-composed-schemas.yaml new file mode 100644 index 00000000000..0da510f5bfc --- /dev/null +++ b/bin/configs/typescript-consolidated-composed-schemas.yaml @@ -0,0 +1,6 @@ +generatorName: typescript +outputDir: samples/openapi3/client/petstore/typescript/builds/composed-schemas +inputSpec: modules/openapi-generator/src/test/resources/3_0/composed-schemas.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript +additionalProperties: + npmName: ts-petstore-client diff --git a/bin/configs/typescript-consolidated-deno.yaml b/bin/configs/typescript-consolidated-deno.yaml index 67fdb69573d..b3317884609 100644 --- a/bin/configs/typescript-consolidated-deno.yaml +++ b/bin/configs/typescript-consolidated-deno.yaml @@ -1,6 +1,9 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/deno inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: deno npmName: ts-petstore-client + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-inversify.yaml b/bin/configs/typescript-consolidated-inversify.yaml index 70277c6e7ad..5d230cb88ea 100644 --- a/bin/configs/typescript-consolidated-inversify.yaml +++ b/bin/configs/typescript-consolidated-inversify.yaml @@ -1,7 +1,10 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/inversify inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: node npmName: ts-petstore-client useInversify: true + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-jquery.yaml b/bin/configs/typescript-consolidated-jquery.yaml index 2a9e79af1b2..7e9669984c2 100644 --- a/bin/configs/typescript-consolidated-jquery.yaml +++ b/bin/configs/typescript-consolidated-jquery.yaml @@ -1,6 +1,9 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/jquery inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: framework: jquery npmName: ts-petstore-client + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-node-object-parameters.yaml b/bin/configs/typescript-consolidated-node-object-parameters.yaml index 40171df194d..5e4e13a7ec7 100644 --- a/bin/configs/typescript-consolidated-node-object-parameters.yaml +++ b/bin/configs/typescript-consolidated-node-object-parameters.yaml @@ -1,7 +1,10 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/object_params inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: node npmName: ts-petstore-client useObjectParameters: true + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-consolidated-node.yaml b/bin/configs/typescript-consolidated-node.yaml index 137a5242ed9..9fb5f9a0553 100644 --- a/bin/configs/typescript-consolidated-node.yaml +++ b/bin/configs/typescript-consolidated-node.yaml @@ -1,6 +1,9 @@ generatorName: typescript outputDir: samples/openapi3/client/petstore/typescript/builds/default inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript additionalProperties: platform: node npmName: ts-petstore-client + projectName: ts-petstore-client + moduleName: petstore diff --git a/bin/configs/typescript-fetch-default-v3.0.yaml b/bin/configs/typescript-fetch-default-v3.0.yaml index 6baf7b2b260..1fbde1d4a43 100644 --- a/bin/configs/typescript-fetch-default-v3.0.yaml +++ b/bin/configs/typescript-fetch-default-v3.0.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/default-v3.0 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/typescript-fetch-default.yaml b/bin/configs/typescript-fetch-default.yaml index 85301d86bb9..1a61fc45e01 100644 --- a/bin/configs/typescript-fetch-default.yaml +++ b/bin/configs/typescript-fetch-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/typescript-fetch-enum.yaml b/bin/configs/typescript-fetch-enum.yaml index 7cac26e381a..609b45160fa 100644 --- a/bin/configs/typescript-fetch-enum.yaml +++ b/bin/configs/typescript-fetch-enum.yaml @@ -1,3 +1,4 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/enum inputSpec: modules/openapi-generator/src/test/resources/3_0/typescript-fetch/enum.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch diff --git a/bin/configs/typescript-fetch-es6-target.yaml b/bin/configs/typescript-fetch-es6-target.yaml index aea1ad31848..929fd29d1ce 100644 --- a/bin/configs/typescript-fetch-es6-target.yaml +++ b/bin/configs/typescript-fetch-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/typescript-fetch-multiple-parameters.yaml b/bin/configs/typescript-fetch-multiple-parameters.yaml index 0bc52605c27..c0711f3baba 100644 --- a/bin/configs/typescript-fetch-multiple-parameters.yaml +++ b/bin/configs/typescript-fetch-multiple-parameters.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/multiple-parameters inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: useSingleRequestParameter: false snapshot: false diff --git a/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml b/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml index 27334256aad..ccb7b51eb7a 100644 --- a/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml +++ b/bin/configs/typescript-fetch-prefix-parameter-interfaces.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-sagas-and-records.yaml b/bin/configs/typescript-fetch-sagas-and-records.yaml index a9fbe6136c7..1f8a48d4ea2 100644 --- a/bin/configs/typescript-fetch-sagas-and-records.yaml +++ b/bin/configs/typescript-fetch-sagas-and-records.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/sagas-and-records inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-typescript-three-plus.yaml b/bin/configs/typescript-fetch-typescript-three-plus.yaml index a18d0d8adbc..f6f3c5ac7bc 100644 --- a/bin/configs/typescript-fetch-typescript-three-plus.yaml +++ b/bin/configs/typescript-fetch-typescript-three-plus.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/typescript-three-plus inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-with-interfaces.yaml b/bin/configs/typescript-fetch-with-interfaces.yaml index e0e84f57d12..926edb431d9 100644 --- a/bin/configs/typescript-fetch-with-interfaces.yaml +++ b/bin/configs/typescript-fetch-with-interfaces.yaml @@ -1,5 +1,6 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-interfaces inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: withInterfaces: "true" diff --git a/bin/configs/typescript-fetch-with-npm-version.yaml b/bin/configs/typescript-fetch-with-npm-version.yaml index 35e2c2a2d3c..cd669c5e0d2 100644 --- a/bin/configs/typescript-fetch-with-npm-version.yaml +++ b/bin/configs/typescript-fetch-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-fetch-without-runtime-checks.yaml b/bin/configs/typescript-fetch-without-runtime-checks.yaml index 15505a8986e..75b9744fd34 100644 --- a/bin/configs/typescript-fetch-without-runtime-checks.yaml +++ b/bin/configs/typescript-fetch-without-runtime-checks.yaml @@ -1,6 +1,7 @@ generatorName: typescript-fetch outputDir: samples/client/petstore/typescript-fetch/builds/without-runtime-checks inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-fetch additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-fetch-petstore' diff --git a/bin/configs/typescript-inversify.yaml b/bin/configs/typescript-inversify.yaml index de2fe10c96b..5c18d8533f8 100644 --- a/bin/configs/typescript-inversify.yaml +++ b/bin/configs/typescript-inversify.yaml @@ -1,3 +1,4 @@ generatorName: typescript-inversify outputDir: samples/client/petstore/typescript-inversify inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-inversify diff --git a/bin/configs/typescript-jquery-default.yaml b/bin/configs/typescript-jquery-default.yaml index 77758d8e45a..088647a8adc 100644 --- a/bin/configs/typescript-jquery-default.yaml +++ b/bin/configs/typescript-jquery-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery diff --git a/bin/configs/typescript-jquery-npm.yaml b/bin/configs/typescript-jquery-npm.yaml index a0e53ec13ed..387da120f3f 100644 --- a/bin/configs/typescript-jquery-npm.yaml +++ b/bin/configs/typescript-jquery-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-jquery outputDir: samples/client/petstore/typescript-jquery/npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-jquery additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/jquery-typescript-petstore' diff --git a/bin/configs/typescript-node-default.yaml b/bin/configs/typescript-node-default.yaml index 0b7bcafa077..bdd6eea3cb5 100644 --- a/bin/configs/typescript-node-default.yaml +++ b/bin/configs/typescript-node-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node diff --git a/bin/configs/typescript-node-npm.yaml b/bin/configs/typescript-node-npm.yaml index 06dafcad370..b61450c0671 100644 --- a/bin/configs/typescript-node-npm.yaml +++ b/bin/configs/typescript-node-npm.yaml @@ -1,6 +1,7 @@ generatorName: typescript-node outputDir: samples/client/petstore/typescript-node/npm inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-node additionalProperties: npmVersion: 0.0.1 npmName: '@openapitools/node-typescript-petstore' diff --git a/bin/configs/typescript-rxjs-default.yaml b/bin/configs/typescript-rxjs-default.yaml index e2006a1ab3e..9c68513400d 100644 --- a/bin/configs/typescript-rxjs-default.yaml +++ b/bin/configs/typescript-rxjs-default.yaml @@ -1,3 +1,4 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/default inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs diff --git a/bin/configs/typescript-rxjs-es6-target.yaml b/bin/configs/typescript-rxjs-es6-target.yaml index cb40131cee4..4889de95854 100644 --- a/bin/configs/typescript-rxjs-es6-target.yaml +++ b/bin/configs/typescript-rxjs-es6-target.yaml @@ -1,6 +1,7 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/es6-target inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs additionalProperties: npmVersion: 1.0.0 supportsES6: true diff --git a/bin/configs/typescript-rxjs-with-npm-version.yaml b/bin/configs/typescript-rxjs-with-npm-version.yaml index 4d2fd37f8f6..6b528e60d87 100644 --- a/bin/configs/typescript-rxjs-with-npm-version.yaml +++ b/bin/configs/typescript-rxjs-with-npm-version.yaml @@ -1,6 +1,7 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/with-npm-version inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs additionalProperties: npmVersion: 1.0.0 npmName: '@openapitools/typescript-rxjs-petstore' diff --git a/bin/configs/typescript-rxjs-with-progress-subscriber.yaml b/bin/configs/typescript-rxjs-with-progress-subscriber.yaml index f20df704bec..b33f917ca44 100644 --- a/bin/configs/typescript-rxjs-with-progress-subscriber.yaml +++ b/bin/configs/typescript-rxjs-with-progress-subscriber.yaml @@ -1,5 +1,6 @@ generatorName: typescript-rxjs outputDir: samples/client/petstore/typescript-rxjs/builds/with-progress-subscriber inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/typescript-rxjs additionalProperties: withProgressSubscriber: "true" diff --git a/docs/customization.md b/docs/customization.md index 23704452f60..6daf72e2130 100644 --- a/docs/customization.md +++ b/docs/customization.md @@ -339,7 +339,7 @@ Your config file for Java can look like } ``` -Or if you preffer yaml format it can look like +Or if you prefer yaml format it can look like ```yaml groupId: "com.my.company" diff --git a/docs/generators.md b/docs/generators.md index c71da0663ed..f1e21a56daf 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -36,6 +36,7 @@ The following generators are available: * [groovy](generators/groovy.md) * [haskell-http-client](generators/haskell-http-client.md) * [java](generators/java.md) +* [java-micronaut-client (beta)](generators/java-micronaut-client.md) * [javascript](generators/javascript.md) * [javascript-apollo (beta)](generators/javascript-apollo.md) * [javascript-closure-angular](generators/javascript-closure-angular.md) @@ -50,6 +51,7 @@ The following generators are available: * [ocaml](generators/ocaml.md) * [perl](generators/perl.md) * [php](generators/php.md) +* [php-dt (beta)](generators/php-dt.md) * [powershell (beta)](generators/powershell.md) * [python (experimental)](generators/python.md) * [python-legacy](generators/python-legacy.md) diff --git a/docs/generators/README.md b/docs/generators/README.md index a8ac9c9310c..b9e8926f664 100644 --- a/docs/generators/README.md +++ b/docs/generators/README.md @@ -39,6 +39,7 @@ The following generators are available: * [ocaml](ocaml.md) * [perl](perl.md) * [php](php.md) +* [php-dt](php-dt.md) * [powershell](powershell.md) * [python](python.md) * [python-legacy](python-legacy.md) diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md index d7e282c8279..6e07567bcc1 100644 --- a/docs/generators/aspnetcore.md +++ b/docs/generators/aspnetcore.md @@ -98,6 +98,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl