Merge branch 'OpenAPITools:master' into qt-progress-info

OpenAPITools · Jul 16, 2024 · 8488cd4 · 8488cd4
2 parents 9410a41 + a81b736
commit 8488cd4
Show file tree

Hide file tree

Showing 7,391 changed files with 31,379 additions and 23,501 deletions.
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.13.0
+        uses: s4u/setup-maven-action@v1.14.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.13.0
+        uses: s4u/setup-maven-action@v1.14.0
         with:
           java-version: 11
           maven-version: 3.8.8

diff --git a/.github/workflows/maven-plugin-tests.yaml b/.github/workflows/maven-plugin-tests.yaml
@@ -39,6 +39,7 @@ jobs:
         run: |
           ./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw --no-snapshot-updates --quiet clean install -f modules/openapi-generator-maven-plugin/examples/multi-module/sample-external-ref-schema/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
diff --git a/.github/workflows/samples-cpp-qt-client.yaml b/.github/workflows/samples-cpp-qt-client.yaml
@@ -3,10 +3,10 @@ name: Samples cpp qt client
 on:
   push:
     branches:
-      - 'samples/client/petstore/cpp-qt/**'
+      - "samples/client/petstore/cpp-qt/**"
   pull_request:
     paths:
-      - 'samples/client/petstore/cpp-qt/**'
+      - "samples/client/petstore/cpp-qt/**"
 
 env:
   GRADLE_VERSION: 6.9
@@ -16,9 +16,6 @@ jobs:
     name: Build cpp qt client
     strategy:
       matrix:
-        qt-version:
-          - '5.15.2'
-          - '6.5.3'
         os:
           - ubuntu-latest
           - macOS-latest
@@ -29,8 +26,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: ${{ matrix.qt-version }}
-          tools: ${{ matrix.tools }}
+          version: "6.7.1"
+          target: "desktop"
       - name: Build
         working-directory: "samples/client/petstore/cpp-qt"
         run: cmake . && cmake --build . --verbose
diff --git a/.github/workflows/samples-dotnet-standard.yaml b/.github/workflows/samples-dotnet-standard.yaml
@@ -28,7 +28,7 @@ jobs:
           # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: 3.1.*
       - name: Build

diff --git a/.github/workflows/samples-dotnet.yaml b/.github/workflows/samples-dotnet.yaml
@@ -34,7 +34,7 @@ jobs:
           - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '8.0.x'
       - name: Build

diff --git a/.github/workflows/samples-dotnet6-client-echo-api.yaml b/.github/workflows/samples-dotnet6-client-echo-api.yaml
@@ -19,7 +19,7 @@ jobs:
           - samples/client/echo_api/csharp-restsharp/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '6.0.x'
       - name: Run echo server

diff --git a/.github/workflows/samples-dotnet6-client.yaml b/.github/workflows/samples-dotnet6-client.yaml
@@ -18,7 +18,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/net6/ParameterMappings/
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '6.0.x'
       - name: Build

diff --git a/.github/workflows/samples-dotnet6-server.yaml b/.github/workflows/samples-dotnet6-server.yaml
@@ -25,7 +25,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
         with:
           dotnet-version: '6.0.x'
       - name: Build

diff --git a/.github/workflows/samples-haskell.yaml b/.github/workflows/samples-haskell.yaml
@@ -5,11 +5,13 @@ on:
     paths:
       - samples/server/petstore/haskell-yesod/**
       - samples/server/petstore/haskell-servant/**
+      - samples/server/others/haskell-servant-ping/**
       - samples/client/petstore/haskell-http-client/**
   pull_request:
     paths:
       - samples/server/petstore/haskell-yesod/**
       - samples/server/petstore/haskell-servant/**
+      - samples/server/others/haskell-servant-ping/**
       - samples/client/petstore/haskell-http-client/**
 jobs:
   build:
@@ -22,6 +24,7 @@ jobs:
           # servers
           - samples/server/petstore/haskell-yesod/
           - samples/server/petstore/haskell-servant/
+          - samples/server/others/haskell-servant-ping/
           - samples/client/petstore/haskell-http-client/
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/samples-java-server-jdk8.yaml b/.github/workflows/samples-java-server-jdk8.yaml
@@ -3,8 +3,6 @@ name: Samples Java Server
 on:
   push:
     paths:
-      # java-camel is tested locally for the time being
-      #- 'samples/server/petstore/java-camel/**'
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
@@ -13,7 +11,6 @@ on:
       - 'samples/server/petstore/java-microprofile/**'
   pull_request:
     paths:
-      #- 'samples/server/petstore/java-camel/**'
       - 'samples/server/petstore/java-vertx-web/**'
       - 'samples/server/petstore/java-inflector/**'
       - 'samples/server/petstore/java-pkmst/**'
@@ -28,7 +25,6 @@ jobs:
       matrix:
         sample:
           # servers
-          #- samples/server/petstore/java-camel/
           - samples/server/petstore/java-vertx-web/
           - samples/server/petstore/java-inflector/
           - samples/server/petstore/java-pkmst/

diff --git a/.github/workflows/samples-jdk17.yaml b/.github/workflows/samples-jdk17.yaml
@@ -9,8 +9,10 @@ on:
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/java/webclient-jakarta/**
+      - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
+      - samples/server/petstore/java-camel/**
       - samples/server/petstore/java-helidon-server/v3/mp/**
       - samples/server/petstore/java-helidon-server/v3/se/**
   pull_request:
@@ -22,8 +24,10 @@ on:
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/java/webclient-jakarta/**
+      - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
+      - samples/server/petstore/java-camel/**
       - samples/server/petstore/java-helidon-server/v3/mp/**
       - samples/server/petstore/java-helidon-server/v3/se/**
 jobs:
@@ -41,8 +45,10 @@ jobs:
           - samples/client/petstore/spring-http-interface-reactive
           - samples/client/petstore/spring-http-interface
           - samples/client/petstore/java/webclient-jakarta
+          - samples/client/petstore/java/microprofile-rest-client-outer-enum
           # servers
           - samples/openapi3/server/petstore/springboot-3
+          - samples/server/petstore/java-camel/
           - samples/server/petstore/java-helidon-server/v3/mp/
           - samples/server/petstore/java-helidon-server/v3/se
           - samples/client/petstore/spring-http-interface-reactive

diff --git a/.github/workflows/samples-python-petstore.yaml b/.github/workflows/samples-python-petstore.yaml
@@ -15,7 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"

diff --git a/.github/workflows/samples-spring-jdk17.yaml b/.github/workflows/samples-spring-jdk17.yaml
@@ -5,12 +5,16 @@ on:
     paths:
       - samples/openapi3/client/petstore/spring-cloud-3-with-optional
       - samples/openapi3/server/petstore/springboot-3
+      - samples/server/petstore/springboot-lombok-data
+      - samples/server/petstore/springboot-lombok-tostring
+      - samples/server/petstore/springboot-file-delegate-optional
   pull_request:
     paths:
       - samples/openapi3/client/petstore/spring-cloud-3-with-optional
       - samples/openapi3/server/petstore/springboot-3
       - samples/server/petstore/springboot-lombok-data
       - samples/server/petstore/springboot-lombok-tostring
+      - samples/server/petstore/springboot-file-delegate-optional
 jobs:
   build:
     name: Build Java Spring (JDK17)
@@ -25,6 +29,7 @@ jobs:
           - samples/openapi3/server/petstore/springboot-3
           - samples/server/petstore/springboot-lombok-data
           - samples/server/petstore/springboot-lombok-tostring
+          - samples/server/petstore/springboot-file-delegate-optional
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -39,7 +39,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.13.0
+        uses: s4u/setup-maven-action@v1.14.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8

diff --git a/Dockerfile b/Dockerfile
@@ -10,14 +10,23 @@ COPY ./LICENSE ${GEN_DIR}
 # Required to compile openapi-generator
 COPY ./google_checkstyle.xml ${GEN_DIR}
 
+# All poms are copied, then we go offline, to allow for better caching of code changes without fetching all dependencies each time
+COPY ./modules/openapi-generator-gradle-plugin/pom.xml ${GEN_DIR}/modules/openapi-generator-gradle-plugin/
+COPY ./modules/openapi-generator-maven-plugin/pom.xml ${GEN_DIR}/modules/openapi-generator-maven-plugin/
+COPY ./modules/openapi-generator-online/pom.xml ${GEN_DIR}/modules/openapi-generator-online/
+COPY ./modules/openapi-generator-cli/pom.xml ${GEN_DIR}/modules/openapi-generator-cli/
+COPY ./modules/openapi-generator-core/pom.xml ${GEN_DIR}/modules/openapi-generator-core/
+COPY ./modules/openapi-generator/pom.xml ${GEN_DIR}/modules/openapi-generator/
+COPY ./pom.xml ${GEN_DIR}
+RUN mvn dependency:go-offline
+
 # Modules are copied individually here to allow for caching of docker layers between major.minor versions
 COPY ./modules/openapi-generator-gradle-plugin ${GEN_DIR}/modules/openapi-generator-gradle-plugin
 COPY ./modules/openapi-generator-maven-plugin ${GEN_DIR}/modules/openapi-generator-maven-plugin
 COPY ./modules/openapi-generator-online ${GEN_DIR}/modules/openapi-generator-online
 COPY ./modules/openapi-generator-cli ${GEN_DIR}/modules/openapi-generator-cli
 COPY ./modules/openapi-generator-core ${GEN_DIR}/modules/openapi-generator-core
 COPY ./modules/openapi-generator ${GEN_DIR}/modules/openapi-generator
-COPY ./pom.xml ${GEN_DIR}
 
 # Pre-compile openapi-generator-cli
 RUN mvn -B -am -pl "modules/openapi-generator-cli" package

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.7.0`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.8.0`):
 [![Build Status](https://api.travis-ci.com/OpenAPITools/openapi-generator.svg?branch=master&status=passed)](https://app.travis-ci.com/github/OpenAPITools/openapi-generator/builds)
 [![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)
@@ -70,7 +70,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<img src="https://openapi-generator.tech/img/companies/litslink.png" width="128" height="128">](https://litslink.com/services/artificial-intelligence?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
 [<img src="https://openapi-generator.tech/img/companies/designli.jpg" width="128" height="128">](https://designli.co?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
 [<img src="https://openapi-generator.tech/img/companies/itm.png" width="128" height="128">](https://opensource.muenchen.de?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
-[<img src="https://openapi-generator.tech/img/companies/kong.png" width="128" height="128">](https://konghq.com/products/kong-konnect/register?utm_medium=referral&utm_source=github&utm_campaign=platform&utm_content=openapi-generator)
+[<img src="https://openapi-generator.tech/img/companies/kong.png" width="128" height="128">](https://konghq.com/products/kong-konnect?utm_medium=referral&utm_source=github&utm_campaign=platform&utm_content=openapi-generator)
 
 
 #### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS, Checkly for sponsoring the API monitoring and Gradle for sponsoring Develocity
@@ -128,8 +128,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.7.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.7.0-SNAPSHOT/) | 20.06.2024   | Minor release with breaking changes (with fallback) |
-| [7.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.6.0) (latest stable release)                                                    | 20.05.2024   | Minor release with breaking changes (with fallback) |
+| 7.8.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.8.0-SNAPSHOT/) | 09.08.2024   | Minor release with breaking changes (with fallback) |
+| [7.7.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.7.0) (latest stable release)                                                    | 02.07.2024   | Minor release with breaking changes (with fallback) |
 | [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
 | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | 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)                       |
@@ -192,16 +192,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.6.0/openapi-generator-cli-7.6.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.7.0/openapi-generator-cli-7.7.0.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.6.0/openapi-generator-cli-7.6.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.7.0/openapi-generator-cli-7.7.0.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/7.6.0/openapi-generator-cli-7.6.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.7.0/openapi-generator-cli-7.7.0.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -599,6 +599,7 @@ Here is a list of community-contributed IDE plug-ins that integrate with OpenAPI
 Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
 
 - [Aalborg University](https://www.aau.dk)
+- [act coding](https://github.com/actcoding)
 - [Adaptant Solutions AG](https://www.adaptant.io/)
 - [adesso SE](https://www.adesso.de/)
 - [Adyen](https://www.adyen.com/)
@@ -932,6 +933,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2023-06-28 - [Generate API contract using OpenAPI Generator Maven plugin](https://huongdanjava.com/generate-api-contract-using-openapi-generator-maven-plugin.html) by [Khanh Nguyen](https://huongdanjava.com/)
 - 2023-06-30 - [Generate Client SDKs with OpenApi Generator in Springboot](https://medium.com/@ramavathvinayak/generate-client-sdks-with-openapi-generator-in-springboot-f9f012e73c0b) by [Vinayak Ramavath](https://medium.com/@ramavathvinayak)
 - 2023-12-10 - [UnityでOpenAPI Generatorを使う](https://www.youtube.com/watch?v=CbNwKVV5LRM) by [Soup Tori](https://www.youtube.com/@souptori8417)
+- 2024-01-24 - [Comment générer des stubs wiremock avec openapi generator](https://www.youtube.com/watch?v=0jhONfBrcKw) by [Alexis Couvreur](https://github.com/acouvreur)
 - 2024-03-04 - [Generating TypeScript Types with OpenAPI for REST API Consumption](https://www.pullrequest.com/blog/generating-typescript-types-with-openapi-for-rest-api-consumption/) by [PullRequest](https://www.pullrequest.com/)
 - 2024-03-07 - [Fully typed Web Apps with OpenAPI (Part 1)](https://medium.com/@gfox1984/fully-typed-web-apps-with-openapi-part-1-595d55766670) by [Guillaume Renard](https://medium.com/@gfox1984)
 - 2024-03-08 - [Laravel OpenAPIによる "辛くない" スキーマ駆動開発](https://fortee.jp/phperkaigi-2024/proposal/9e2e6c38-d078-4efa-99b4-83ebf9033b34) by [KentarouTakeda](https://twitter.com/KentarouTakeda)
@@ -1084,6 +1086,7 @@ Here is a list of template creators:
    * Java Vert.x: @lwlee2608
    * Java Micronaut: @andriy-dmytruk
    * Java Helidon: @spericas @tjquinno @tvallin
+   * Java WireMock: [@acouvreur](https://github.com/acouvreur)
    * JAX-RS RestEasy: @chameleon82
    * JAX-RS CXF: @hiveship
    * JAX-RS CXF (CDI): @nickcmaynard

diff --git a/bin/configs/haskell-servant-ping.yaml b/bin/configs/haskell-servant-ping.yaml
@@ -0,0 +1,4 @@
+generatorName: haskell
+outputDir: samples/server/others/haskell-servant-ping
+inputSpec: modules/openapi-generator/src/test/resources/3_0/ping.yaml
+templateDir: modules/openapi-generator/src/main/resources/haskell-servant
diff --git a/bin/configs/java-microprofile-rest-client-outer-enum.yaml b/bin/configs/java-microprofile-rest-client-outer-enum.yaml
@@ -0,0 +1,8 @@
+generatorName: java
+outputDir: samples/client/petstore/java/microprofile-rest-client-outer-enum
+library: microprofile
+inputSpec: modules/openapi-generator/src/test/resources/3_0/outerEnum.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  artifactId: microprofile-rest-client
+  configKeyFromClassName: true
diff --git a/bin/configs/k6.yaml b/bin/configs/k6.yaml
@@ -1,6 +1,6 @@
 generatorName: k6
 outputDir: samples/client/petstore/k6
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/k6/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/k6
 additionalProperties:
   appName: PetstoreClient
diff --git a/bin/configs/rust-hyper0x-petstore.yaml b/bin/configs/rust-hyper0x-petstore.yaml
@@ -0,0 +1,8 @@
+generatorName: rust
+outputDir: samples/client/petstore/rust/hyper0x/petstore
+library: hyper0x
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust
+additionalProperties:
+  supportAsync: "false"
+  packageName: petstore-hyper0x
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ jobs: @@
           fail-fast: false
           matrix:
             python-version:
-              - "3.7"
               - "3.8"
               - "3.9"
               - "3.10"
@@ Expand Down @@