merge master

jpfinne · May 9, 2024 · 44bb56a · 44bb56a
1 parent 4617c9f
commit 44bb56a
Show file tree

Hide file tree

Showing 1,166 changed files with 43,973 additions and 15,203 deletions.
diff --git a/.github/workflows/samples-java-server-jdk8.yaml b/.github/workflows/samples-java-server-jdk8.yaml
@@ -10,13 +10,15 @@ on:
       - 'samples/server/petstore/java-pkmst/**'
       # test in circleci instead
       - 'samples/server/petstore/java-undertow/**'
+      - '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/**'
       #- 'samples/server/petstore/java-undertow/**'
+      - 'samples/server/petstore/java-microprofile/**'
 jobs:
   build:
     name: Build Java Server
@@ -31,6 +33,7 @@ jobs:
           - samples/server/petstore/java-inflector/
           - samples/server/petstore/java-pkmst/
           #- samples/server/petstore/java-undertow/
+          - samples/server/petstore/java-microprofile/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

diff --git a/.github/workflows/samples-kotlin-client.yaml b/.github/workflows/samples-kotlin-client.yaml
@@ -10,9 +10,6 @@ on:
       - 'samples/client/petstore/kotlin*/**'
       - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
 
-env:
-  GRADLE_VERSION: 6.9
-
 jobs:
   build:
     name: Build Kotlin client
@@ -65,15 +62,14 @@ jobs:
           - samples/client/echo_api/kotlin-jvm-spring-3-webclient
           - samples/client/petstore/kotlin-jvm-spring-3-restclient
           - samples/client/echo_api/kotlin-jvm-spring-3-restclient
-          - samples/client/petstore/kotlin-spring-cloud
           - samples/client/petstore/kotlin-name-parameter-mappings
           - samples/client/others/kotlin-jvm-okhttp-parameter-tests
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 8
+          java-version: 11
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:
@@ -85,7 +81,6 @@ jobs:
       - name: Install Gradle wrapper
         uses: eskatos/gradle-command-action@v3
         with:
-          gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}
           arguments: wrapper
       - name: Build

diff --git a/.github/workflows/samples-kotlin-echo-api.yaml b/.github/workflows/samples-kotlin-echo-api.yaml
@@ -7,8 +7,7 @@ on:
   pull_request:
     paths:
       - samples/client/echo_api/kotlin**
-env:
-  GRADLE_VERSION: 7.4
+
 jobs:
   build:
     name: Build Kotlin Client JDK17
@@ -37,7 +36,6 @@ jobs:
       - name: Install Gradle wrapper
         uses: eskatos/gradle-command-action@v3
         with:
-          gradle-version: ${{ env.GRADLE_VERSION }}
           build-root-directory: ${{ matrix.sample }}
           arguments: wrapper
       - name: Setup node.js

diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml
@@ -43,6 +43,7 @@ jobs:
           - samples/server/petstore/kotlin-server/javalin
           - samples/server/others/kotlin-server/jaxrs-spec
           - samples/server/others/kotlin-server/jaxrs-spec-array-response
+          - samples/server/petstore/kotlin-spring-cloud
           # comment out due to gradle build failure
           #- samples/server/petstore/kotlin-spring-default
           # no build.gradle file

diff --git a/.sdkmanrc b/.sdkmanrc
@@ -0,0 +1,2 @@
+java=11.0.23-tem
+maven=3.8.8
diff --git a/README.md b/README.md
@@ -260,7 +260,7 @@ To build from source, you need the following installed and available in your `$P
 
 * [Java 11](https://adoptium.net/)
 
-* [Apache Maven 3.3.4 or greater](https://maven.apache.org/) (optional)
+* [Apache Maven 3.8.8 or greater](https://maven.apache.org/) (optional)
 
 After cloning the project, you can build it from source using [maven wrapper](https://maven.apache.org/wrapper/):
 

diff --git a/bin/configs/cpp-pistache-server-cpp-pistache-everything.yaml b/bin/configs/cpp-pistache-server-cpp-pistache-everything.yaml
@@ -0,0 +1,7 @@
+generatorName: cpp-pistache-server
+outputDir: samples/server/petstore/cpp-pistache-everything
+inputSpec: modules/openapi-generator/src/test/resources/3_0/issues-anytype-object-set-petstore-everything.yaml
+templateDir: modules/openapi-generator/src/main/resources/cpp-pistache-server
+additionalProperties:
+  useStructModel: "false"
+  addExternalLibs: "true"
diff --git a/bin/configs/cpp-pistache-server-cpp-pistache-nested-schema-refs.yaml b/bin/configs/cpp-pistache-server-cpp-pistache-nested-schema-refs.yaml
@@ -0,0 +1,7 @@
+generatorName: cpp-pistache-server
+outputDir: samples/server/petstore/cpp-pistache-nested-schema-refs
+inputSpec: modules/openapi-generator/src/test/resources/3_0/nested-schema-refs.yaml
+templateDir: modules/openapi-generator/src/main/resources/cpp-pistache-server
+additionalProperties:
+  useStructModel: "false"
+  addExternalLibs: "true"
diff --git a/bin/configs/java-microprofile-rest-client.yaml b/bin/configs/java-microprofile-rest-client.yaml
@@ -1,8 +1,8 @@
 generatorName: java
 outputDir: samples/client/petstore/java/microprofile-rest-client
 library: microprofile
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/Java
 additionalProperties:
   artifactId: microprofile-rest-client
-  configKey: petstore
+  configKeyFromClassName: true
diff --git a/bin/configs/java-microprofile-server-multiple-2xx-responses.yaml b/bin/configs/java-microprofile-server-multiple-2xx-responses.yaml
@@ -0,0 +1,8 @@
+generatorName: java-microprofile
+outputDir: samples/server/petstore/java-microprofile
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-multiple-2xx-responses.yaml
+templateDir: modules/openapi-generator/src/main/resources/Java
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  microprofileMutiny: "true"
+  serializationLibrary: "jackson"
diff --git a/bin/configs/jaxrs-spec.yaml b/bin/configs/jaxrs-spec.yaml
@@ -1,6 +1,6 @@
 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
+inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
 additionalProperties:
   artifactId: jaxrs-spec-petstore-server

diff --git a/bin/configs/kotlin-jvm-spring-3-webclient-echo-api.yaml b/bin/configs/kotlin-jvm-spring-3-webclient-echo-api.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/echo_api/kotlin-jvm-spring-3-webclient
-library: jvm-spring-restclient
+library: jvm-spring-webclient
 inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/echo_api.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:

diff --git a/bin/configs/kotlin-spring-cloud.yaml b/bin/configs/kotlin-spring-cloud.yaml
@@ -1,5 +1,5 @@
 generatorName: kotlin-spring
-outputDir: samples/client/petstore/kotlin-spring-cloud
+outputDir: samples/server/petstore/kotlin-spring-cloud
 library: spring-cloud
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring

diff --git a/bin/configs/manual/rust-axum-header-uuid.yaml b/bin/configs/manual/rust-axum-header-uuid.yaml
@@ -0,0 +1,9 @@
+generatorName: rust-axum
+outputDir: samples/server/petstore/rust-axum/output/rust-axum-header-uuid
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust-axum/rust-axum-header-uuid.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-axum
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: rust-axum-header-uui
+enablePostProcessFile: true
diff --git a/bin/configs/manual/rust-axum-validation.yaml b/bin/configs/manual/rust-axum-validation.yaml
@@ -0,0 +1,10 @@
+generatorName: rust-axum
+outputDir: samples/server/petstore/rust-axum/output/rust-axum-validation-test
+inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/rust-axum-validation-test.yaml
+templateDir: modules/openapi-generator/src/main/resources/rust-axum
+generateAliasAsModel: true
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  packageName: rust-axum-validation-test
+  disableValidator: "true"
+enablePostProcessFile: true
diff --git a/bin/configs/html2.yaml → bin/configs/unmaintained/html2.yaml b/bin/configs/html2.yaml → bin/configs/unmaintained/html2.yaml
diff --git a/docs/generators.md b/docs/generators.md
@@ -101,6 +101,7 @@ The following generators are available:
 * [java-helidon-server (beta)](generators/java-helidon-server.md)  
 * [java-inflector](generators/java-inflector.md)  
 * [java-micronaut-server (beta)](generators/java-micronaut-server.md)  
+* [java-microprofile](generators/java-microprofile.md)  
 * [java-msf4j](generators/java-msf4j.md)  
 * [java-pkmst](generators/java-pkmst.md)  
 * [java-play-framework](generators/java-play-framework.md)  

diff --git a/docs/generators/cpp-pistache-server.md b/docs/generators/cpp-pistache-server.md
@@ -28,7 +28,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 
 | Type/Alias | Imports |
 | ---------- | ------- |
-|Object|#include &quot;Object.h&quot;|
 |nlohmann::json|#include &lt;nlohmann/json.hpp&gt;|
 |std::map|#include &lt;map&gt;|
 |std::string|#include &lt;string&gt;|