Merge remote-tracking branch 'origin/master' into 6.0.x

.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*'

.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

README.md

@@ -9,7 +9,7 @@
 
 <div align="center">
 
-[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.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 (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.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.2.1) (latest stable release)                                                    | 016.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) |
 | [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.
 <!-- RELEASE_VERSION -->
 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`)
 
 <!-- RELEASE_VERSION -->
-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)
 <!-- /RELEASE_VERSION -->
 
 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

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}'

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"

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

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

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"

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

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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

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

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

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

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}'

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}'

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}'

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}'

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"

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

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

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

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

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

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"

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

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"

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

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

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"

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"

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

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

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

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

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}'

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}'

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"

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"

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

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"

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"

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"

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"

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"

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

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

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

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"

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'

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

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

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'

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

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'

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

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"

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"

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

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"

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

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'

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

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'

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"

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'

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'

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'

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'

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"

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

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

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

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

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

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

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

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

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

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"

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

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

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

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

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

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

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

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

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