Merge pull request OpenAPITools#1 from OpenAPITools/master

update master

Author: ksvirkou-hubspot

.github/workflows/check-supported-versions.yaml

@@ -15,13 +15,13 @@ jobs:
         include:
           - java: 8
             os: windows-latest
-          - java: 13
+          - java: 17
             os: ubuntu-latest
-            # Need to update to Gradle version with v13 support in modules/openapi-generator-gradle-plugin/pom.xml
-            flags: -am -pl modules/openapi-generator-cli
+            # Need to update to Gradle version with v17 support in modules/openapi-generator-gradle-plugin/pom.xml
+            flags: -am -pl modules/openapi-generator-cli -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v2
@@ -50,7 +50,7 @@ jobs:
         run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml ${{ matrix.flags }}
 
       - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v3
         if: matrix.java == '8' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -79,9 +79,9 @@ jobs:
 #             flags: --skip-docs
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Download build artifact
-        uses: actions/download-artifact@v2.1.0
+        uses: actions/download-artifact@v3
         with:
           name: artifact
       - name: Run Ensures Script

.github/workflows/gradle-test.yaml

@@ -33,7 +33,7 @@ jobs:
           - samples/openapi3/client/petstore/java/jersey2-java8
           - samples/client/petstore/java/okhttp-gson
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/openapi-generator.yaml

@@ -15,7 +15,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
@@ -39,7 +39,7 @@ jobs:
         run: mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
       - run: ls -la  modules/openapi-generator-cli/target
       - name: Upload openapi-generator-cli.jar artifact
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v3
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -51,7 +51,7 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
@@ -75,7 +75,7 @@ jobs:
         run: mvn --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error
       - name: Publish unit test reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v3
         with:
           name: surefire-test-results
           path: '**/surefire-reports/TEST-*.xml'
@@ -86,14 +86,14 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
           java-version: 8
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v2.1.0
+        uses: actions/download-artifact@v3
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -125,14 +125,14 @@ jobs:
       - build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 8
         uses: actions/setup-java@v2
         with:
           java-version: 8
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v2.1.0
+        uses: actions/download-artifact@v3
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -160,7 +160,7 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
@@ -193,7 +193,7 @@ jobs:
     needs:
       - build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:

.github/workflows/samples-dart.yaml

@@ -17,7 +17,7 @@ jobs:
     name: Tests Dart 2.10
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
@@ -50,7 +50,7 @@ jobs:
     name: Tests Dart 2.13
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-dotnet.yaml

@@ -22,8 +22,8 @@ jobs:
           - samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt
           - samples/server/petstore/aspnetcore-6.0
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v2
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-groovy.yaml

@@ -21,7 +21,7 @@ jobs:
         sample:
           - samples/client/petstore/groovy
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-java-client-jdk11.yaml

@@ -38,7 +38,7 @@ jobs:
           - samples/client/petstore/java/feign
           - samples/client/petstore/java/jersey1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-java-play-framework.yaml

@@ -29,7 +29,7 @@ jobs:
           - samples/server/petstore/java-play-framework-no-swagger-ui
           - samples/server/petstore/java-play-framework-no-wrap-calls
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-jaxrs.yaml

@@ -34,14 +34,12 @@ jobs:
           - samples/server/petstore/jaxrs-resteasy/eap-joda
           - samples/server/petstore/jaxrs-resteasy/eap-java8
           - samples/server/petstore/jaxrs-resteasy/joda
-          - samples/server/petstore/jaxrs-resteasy/default-value
           - samples/server/petstore/jaxrs-cxf
           - samples/server/petstore/jaxrs-cxf-annotated-base-path
           - samples/server/petstore/jaxrs-cxf-cdi
-          - samples/server/petstore/jaxrs-cxf-cdi-default-value
           - samples/server/petstore/jaxrs-cxf-non-spring-app
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-kotlin-client.yaml

@@ -40,7 +40,7 @@ jobs:
           - samples/client/petstore/kotlin-uppercase-enum
           - samples/client/petstore/kotlin-array-simple-string
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-kotlin-server.yaml

@@ -30,7 +30,7 @@ jobs:
           # no build.gradle file
           #- samples/server/petstore/kotlin-vertx-modelMutable
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-scala.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/scalatra
           - samples/server/petstore/scala-finch # cannot be tested with jdk11
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/samples-spring.yaml

@@ -38,8 +38,9 @@ jobs:
           - samples/server/petstore/springboot-delegate
           - samples/openapi3/server/petstore/springboot-delegate
           - samples/server/petstore/spring-boot-nullable-set
+          - samples/server/petstore/spring-boot-defaultInterface-unhandledException
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'

.github/workflows/sonar.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'OpenAPITools' }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:

README.md

@@ -3,7 +3,7 @@
 
 <div align="center">
 
-[![Stable releaases in Maven Central](https://img.shields.io/maven-metadata/v/https/repo1.maven.org/maven2/org/openapitools/openapi-generator/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22) [![Apache 2.0 License](https://img.shields.io/badge/License-Apache%202.0-orange)](./LICENSE) [![Open Collective backers](https://img.shields.io/opencollective/backers/openapi_generator?color=orange&label=OpenCollective%20Backers)](https://opencollective.com/openapi_generator) [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g) [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
+[![Stable releases in Maven Central](https://img.shields.io/maven-metadata/v/https/repo1.maven.org/maven2/org/openapitools/openapi-generator/maven-metadata.xml.svg)](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.openapitools%22%20AND%20a%3A%22openapi-generator%22) [![Apache 2.0 License](https://img.shields.io/badge/License-Apache%202.0-orange)](./LICENSE) [![Open Collective backers](https://img.shields.io/opencollective/backers/openapi_generator?color=orange&label=OpenCollective%20Backers)](https://opencollective.com/openapi_generator) [![Join the Slack chat room](https://img.shields.io/badge/Slack-Join%20the%20chat%20room-orange)](https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g) [![Follow OpenAPI Generator Twitter account to get the latest update](https://img.shields.io/twitter/follow/oas_generator.svg?style=social&label=Follow)](https://twitter.com/oas_generator)
 
 </div>
 
@@ -699,8 +699,8 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019/01/30 - [Rapid Application Development With API First Approach Using Open-API Generator](https://dzone.com/articles/rapid-api-development-using-open-api-generator) by [Milan Sonkar](https://dzone.com/users/828329/milan_sonkar.html)
 - 2019/02/02 - [平静を保ち、コードを生成せよ 〜 OpenAPI Generator誕生の背景と軌跡 〜](https://speakerdeck.com/akihito_nakano/gunmaweb34) by [中野暁人](https://github.com/ackintosh) at [Gunma.web #34 スキーマ駆動開発](https://gunmaweb.connpass.com/event/113974/)
 - 2019/02/20 - [An adventure in OpenAPI V3 code generation](https://mux.com/blog/an-adventure-in-openapi-v3-api-code-generation/) by [Phil Cluff](https://mux.com/blog/author/philc/)
-- 2019/02/26 - [Building API Services: A Beginner’s Guide](https://medium.com/google-cloud/building-api-services-a-beginners-guide-7274ae4c547f) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platofrm Blog](https://medium.com/google-cloud)
-- 2019/02/26 - [Building APIs with OpenAPI: Continued](https://medium.com/@ratrosy/building-apis-with-openapi-continued-5d0faaed32eb) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platofrm Blog](https://medium.com/google-cloud)
+- 2019/02/26 - [Building API Services: A Beginner’s Guide](https://medium.com/google-cloud/building-api-services-a-beginners-guide-7274ae4c547f) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platform Blog](https://medium.com/google-cloud)
+- 2019/02/26 - [Building APIs with OpenAPI: Continued](https://medium.com/@ratrosy/building-apis-with-openapi-continued-5d0faaed32eb) by [Ratros Y.](https://medium.com/@ratrosy) in [Google Cloud Platform Blog](https://medium.com/google-cloud)
 - 2019-03-07 - [OpenAPI Generator で Spring Boot と Angular をタイプセーフに繋ぐ](https://qiita.com/chibato/items/e4a748db12409b40c02f) by [Tomofumi Chiba](https://github.com/chibat)
 - 2019-03-16 - [A Quick introduction to manual OpenAPI V3](https://vadosware.io/post/quick-intro-to-manual-openapi-v3/) by [vados](https://github.com/t3hmrman) at [VADOSWARE](https://vadosware.io)
 - 2019-03-25 - [Access any REST service with the SAP S/4HANA Cloud SDK](https://blogs.sap.com/2019/03/25/integrate-sap-s4hana-cloud-sdk-with-open-api/) by [Alexander Duemont](https://people.sap.com/alexander.duemont)
@@ -906,9 +906,9 @@ Here is a list of template creators:
    * Java (Java 11 Native HTTP client): @bbdouglas
    * Java (Apache HttpClient): @harrywhite4
    * Javascript/NodeJS: @jfiala
-   * Javascript (Apollo DataSource): @erithmetic
-   * Javascript (Closure-annotated Angular) @achew22
-   * Javascript (Flow types) @jaypea
+   * JavaScript (Apollo DataSource): @erithmetic
+   * JavaScript (Closure-annotated Angular) @achew22
+   * JavaScript (Flow types) @jaypea
    * JMeter: @davidkiss
    * Kotlin: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
    * Kotlin (MultiPlatform): @andrewemery
@@ -1082,7 +1082,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Rust              | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05)                                                                                                                               |
 | Scala             | @clasnake (2017/07), @jimschubert (2017/09) [:heart:](https://www.patreon.com/jimschubert), @shijinkui  (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04)                                                          |
 | Swift             | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11)                                                                                                                                       |
-| TypeScript        | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) |
+| TypeScript        | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) |
 
 :heart: = Link to support the contributor directly
 

bin/configs/java-camel-petstore-new.yaml

@@ -12,6 +12,6 @@ additionalProperties:
   library: "spring-boot"
   withXml: true
   jackson: true
-  camelUseDefaulValidationtErrorProcessor: true
+  camelUseDefaultValidationtErrorProcessor: true
   camelRestClientRequestValidation: true
   camelSecurityDefinitions: true

bin/configs/java-okhttp-gson.yaml

@@ -6,3 +6,4 @@ templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   artifactId: petstore-okhttp-gson
   hideGenerationTimestamp: "true"
+  useOneOfDiscriminatorLookup: "true"

bin/configs/jaxrs-cxf-cdi-default-values.yaml

@@ -4,3 +4,4 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi
 additionalProperties:
   hideGenerationTimestamp: "true"
+  implicitHeadersRegex: api_key

bin/configs/jaxrs-cxf-cdi.yaml

@@ -5,3 +5,4 @@ templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/cxf
 additionalProperties:
   hideGenerationTimestamp: "true"
   serverPort: "8082"
+  implicitHeadersRegex: (api_key|enum_header_string)

bin/configs/jaxrs-cxf.yaml

@@ -4,3 +4,4 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy
 additionalProperties:
   hideGenerationTimestamp: "true"
+  implicitHeadersRegex: api_key

bin/configs/jaxrs-resteasy-default-values.yaml

@@ -6,3 +6,4 @@ additionalProperties:
   artifactId: jaxrs-resteasy-eap-java8-server
   hideGenerationTimestamp: "true"
   dateLibrary: java8
+  implicitHeadersRegex: api_key

bin/configs/jaxrs-resteasy-default.yaml

@@ -7,3 +7,4 @@ additionalProperties:
   interfaceOnly: "true"
   serializableModel: "true"
   hideGenerationTimestamp: "true"
+  implicitHeadersRegex: (api_key|enum_header_string)

bin/configs/jaxrs-resteasy-eap-eap-java8.yaml

@@ -6,3 +6,4 @@ additionalProperties:
   artifactId: jaxrs-spec-petstore-server
   serializableModel: "true"
   hideGenerationTimestamp: "true"
+  implicitHeadersRegex: (api_key|enum_header_string)

bin/configs/jaxrs-spec-interface.yaml

@@ -0,0 +1,9 @@
+generatorName: rust
+outputDir: samples/client/petstore/rust/reqwest/petstore-awsv4signature
+library: reqwest
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust
+additionalProperties:
+  supportAsync: false
+  packageName: petstore-reqwest-awsv4signature
+  withAWSV4Signature: true

bin/configs/jaxrs-spec.yaml

@@ -0,0 +1,11 @@
+generatorName: spring
+outputDir: samples/server/petstore/spring-boot-defaultInterface-unhandledException
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  artifactId: spring-boot-defaultInterface-unhandledException
+  hideGenerationTimestamp: true
+  java8: true
+  interfaceOnly: true
+  skipDefaultInterface: true
+  unhandledException: true

bin/configs/rust-reqwest-petstore-awsv4signature.yaml

@@ -6,4 +6,4 @@ additionalProperties:
   artifactId: springboot-implicitHeaders
   documentationProvider: springfox
   hideGenerationTimestamp: "true"
-  implicitHeaders: true
+  implicitHeadersRegex: .*