Merge branch 'master' into renatomameli-fix-enum-PascalCase-underscores

.github/workflows/samples-java-helidon.yaml → .github/workflows/samples-java-helidon-v3.yaml

@@ -1,14 +1,14 @@
-name: Samples Java Helidon
+name: Samples Java Helidon v3
 
 on:
   push:
     paths:
-      - samples/client/petstore/java-helidon-client/**
-      - samples/server/petstore/java-helidon-server/**
+      - samples/client/petstore/java-helidon-client/v3/**
+      - samples/server/petstore/java-helidon-server/v3/**
   pull_request:
     paths:
-      - samples/client/petstore/java-helidon-client/**
-      - samples/server/petstore/java-helidon-server/**
+      - samples/client/petstore/java-helidon-client/v3/**
+      - samples/server/petstore/java-helidon-server/v3/**
 jobs:
   build:
     name: Build Java Helidon 
@@ -17,10 +17,10 @@ jobs:
       fail-fast: false
       matrix:
         sample:
-          - samples/client/petstore/java-helidon-client/mp
-          - samples/client/petstore/java-helidon-client/se
-          - samples/server/petstore/java-helidon-server/mp
-          - samples/server/petstore/java-helidon-server/se
+          - samples/client/petstore/java-helidon-client/v3/mp
+          - samples/client/petstore/java-helidon-client/v3/se
+          - samples/server/petstore/java-helidon-server/v3/mp
+          - samples/server/petstore/java-helidon-server/v3/se
         version: [17]
     steps:
       - uses: actions/checkout@v4

.github/workflows/samples-java-helidon-v4.yaml

@@ -0,0 +1,39 @@
+name: Samples Java Helidon v4
+
+on:
+  push:
+    paths:
+      - samples/client/petstore/java-helidon-client/v4/**
+      - samples/server/petstore/java-helidon-server/v4/**
+  pull_request:
+    paths:
+      - samples/client/petstore/java-helidon-client/v4/**
+      - samples/server/petstore/java-helidon-server/v4/**
+jobs:
+  build:
+    name: Build Java Helidon 
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/client/petstore/java-helidon-client/v4/mp
+          - samples/server/petstore/java-helidon-server/v4/mp
+        version: [21]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.version }}
+      - name: Cache maven dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package

.github/workflows/samples-jdk17.yaml

@@ -4,28 +4,28 @@ on:
     paths:
       # clients
       - samples/openapi3/client/petstore/spring-cloud-3/**
-      - samples/client/petstore/java-helidon-client/mp/**
-      - samples/client/petstore/java-helidon-client/se/**
+      - samples/client/petstore/java-helidon-client/v3/mp/**
+      - samples/client/petstore/java-helidon-client/v3/se/**
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/java/webclient-jakarta/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
-      - samples/server/petstore/java-helidon-server/mp/**
-      - samples/server/petstore/java-helidon-server/se/**
+      - samples/server/petstore/java-helidon-server/v3/mp/**
+      - samples/server/petstore/java-helidon-server/v3/se/**
   pull_request:
     paths:
       # clients
       - samples/openapi3/client/petstore/spring-cloud-3/**
-      - samples/client/petstore/java-helidon-client/mp/**
-      - samples/client/petstore/java-helidon-client/se/**
+      - samples/client/petstore/java-helidon-client/v3/mp/**
+      - samples/client/petstore/java-helidon-client/v3/se/**
       - samples/client/petstore/spring-http-interface-reactive/**
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/java/webclient-jakarta/**
       # servers
       - samples/openapi3/server/petstore/springboot-3/**
-      - samples/server/petstore/java-helidon-server/mp/**
-      - samples/server/petstore/java-helidon-server/se/**
+      - samples/server/petstore/java-helidon-server/v3/mp/**
+      - samples/server/petstore/java-helidon-server/v3/se/**
 jobs:
   build:
     name: Build with JDK17
@@ -36,15 +36,15 @@ jobs:
         sample:
           # clients
           - samples/openapi3/client/petstore/spring-cloud-3
-          - samples/client/petstore/java-helidon-client/mp
-          - samples/client/petstore/java-helidon-client/se
+          - samples/client/petstore/java-helidon-client/v3/mp/
+          - samples/client/petstore/java-helidon-client/v3/se
           - samples/client/petstore/spring-http-interface-reactive
           - samples/client/petstore/spring-http-interface
           - samples/client/petstore/java/webclient-jakarta
           # servers
           - samples/openapi3/server/petstore/springboot-3
-          - samples/server/petstore/java-helidon-server/mp
-          - samples/server/petstore/java-helidon-server/se
+          - samples/server/petstore/java-helidon-server/v3/mp/
+          - samples/server/petstore/java-helidon-server/v3/se
           - samples/client/petstore/spring-http-interface-reactive
           - samples/client/petstore/spring-http-interface
     steps:

.github/workflows/samples-jdk21.yaml

@@ -0,0 +1,43 @@
+name: Samples JDK21
+on:
+  push:
+    paths:
+      # clients
+      - samples/client/petstore/java-helidon-client/v4/mp/**
+      # servers
+      - samples/server/petstore/java-helidon-server/v4/mp/**
+  pull_request:
+    paths:
+      # clients
+      - samples/client/petstore/java-helidon-client/v4/mp/**
+      # servers
+      - samples/server/petstore/java-helidon-server/v4/mp/**
+jobs:
+  build:
+    name: Build with JDK21
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          # clients
+          - samples/client/petstore/java-helidon-client/v4/mp/
+          # servers
+          - samples/server/petstore/java-helidon-server/v4/mp/
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
+      - name: Cache maven dependencies
+        uses: actions/cache@v4
+        env:
+          cache-name: maven-repository
+        with:
+          path: |
+            ~/.m2
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: mvn clean package

CI/circle_parallel.sh

@@ -43,6 +43,7 @@ elif [ "$NODE_INDEX" = "2" ]; then
   (cd samples/client/petstore/go && mvn integration-test)
   (cd samples/openapi3/client/petstore/go && mvn integration-test)
   (cd samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false && mvn integration-test)
+  (cd samples/client/others/go/allof_multiple_ref_and_discriminator && mvn integration-test)
 
 elif [ "$NODE_INDEX" = "3" ]; then
 

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"

bin/configs/cpp-restsdk-client.yaml

@@ -1,6 +1,6 @@
 generatorName: cpp-restsdk
 outputDir: samples/client/petstore/cpp-restsdk/client
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/cpp-restsdk/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/cpp-rest-sdk-client
 additionalProperties:
   packageName: CppRestPetstoreClient

bin/configs/go-multiple-allof-ref-with-discriminator.yaml

@@ -0,0 +1,5 @@
+generatorName: go
+outputDir: samples/client/others/go/allof_multiple_ref_and_discriminator
+inputSpec: modules/openapi-generator/src/test/resources/3_0/go/allof_multiple_ref_and_discriminator.yaml
+additionalProperties:
+  hideGenerationTimestamp: "true"

bin/configs/java-helidon-client-mp.yaml → bin/configs/java-helidon-client-mp_3.yaml

@@ -1,8 +1,9 @@
 generatorName: java-helidon-client
 library: mp
-outputDir: samples/client/petstore/java-helidon-client/mp
+outputDir: samples/client/petstore/java-helidon-client/v3/mp
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 additionalProperties:
+  helidonVersion: 3.2.7
   artifactId: petstore-helidon-client-mp
   hideGenerationTimestamp: "true"
   configureAuth: "false"

bin/configs/java-helidon-client-mp_4.yaml

@@ -0,0 +1,14 @@
+generatorName: java-helidon-client
+library: mp
+outputDir: samples/client/petstore/java-helidon-client/v4/mp
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+additionalProperties:
+  helidonVersion: 4.0.8
+  artifactId: petstore-helidon-client-mp
+  hideGenerationTimestamp: "true"
+  configureAuth: "false"
+  build: "all"
+  test: "spock"
+  requiredPropertiesInConstructor: "false"
+  visitable: "true"
+  fullProject: "true"

bin/configs/java-helidon-client-se.yaml → bin/configs/java-helidon-client-se_3.yaml

@@ -1,8 +1,9 @@
 generatorName: java-helidon-client
 library: se
-outputDir: samples/client/petstore/java-helidon-client/se
+outputDir: samples/client/petstore/java-helidon-client/v3/se
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 additionalProperties:
+  helidonVersion: 3.2.7
   artifactId: petstore-helidon-client-se
   hideGenerationTimestamp: "true"
   configureAuth: "false"

bin/configs/java-helidon-server-mp.yaml → bin/configs/java-helidon-server-mp_3.yaml

@@ -1,9 +1,10 @@
 generatorName: java-helidon-server
 library: mp
-outputDir: samples/server/petstore/java-helidon-server/mp
+outputDir: samples/server/petstore/java-helidon-server/v3/mp
 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-helidon/server
 additionalProperties:
+  helidonVersion: 3.2.7
   artifactId: petstore-helidon-server-mp
   hideGenerationTimestamp: "true"
   build: "all"

bin/configs/java-helidon-server-mp_4.yaml

@@ -0,0 +1,13 @@
+generatorName: java-helidon-server
+library: mp
+outputDir: samples/server/petstore/java-helidon-server/v4/mp
+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-helidon/server
+additionalProperties:
+  helidonVersion: 4.0.8
+  artifactId: petstore-helidon-server-mp
+  hideGenerationTimestamp: "true"
+  build: "all"
+  test: "spock"
+  useAuth: "false"
+  fullProject: "true"

bin/configs/java-helidon-server-se.yaml → bin/configs/java-helidon-server-se_3.yaml

@@ -1,9 +1,10 @@
 generatorName: java-helidon-server
 library: se
-outputDir: samples/server/petstore/java-helidon-server/se
+outputDir: samples/server/petstore/java-helidon-server/v3/se
 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-helidon/server
 additionalProperties:
+  helidonVersion: 3.2.7
   artifactId: petstore-helidon-server-se
   hideGenerationTimestamp: "true"
   fullProject: "true"

bin/configs/java-native.yaml

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

bin/configs/java-resttemplate.yaml

@@ -9,3 +9,4 @@ additionalProperties:
   java8: true
   containerDefaultToNull: true
   generateConstructorWithAllArgs: true
+  generateBuilders: true

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

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

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

bin/configs/spring-boot-3.yaml

@@ -12,3 +12,4 @@ additionalProperties:
   withXml: true
   hideGenerationTimestamp: "true"
   generateConstructorWithAllArgs: true
+  generateBuilders: true

bin/configs/spring-boot-lombok-data.yaml

@@ -8,3 +8,4 @@ additionalProperties:
   hideGenerationTimestamp: "true"
   additionalModelTypeAnnotations: "@lombok.Data;@lombok.Builder;@lombok.NoArgsConstructor;@lombok.AllArgsConstructor"
   generateConstructorWithAllArgs: true
+  generateBuilders: true

bin/configs/spring-boot-oneof.yaml

@@ -8,3 +8,4 @@ additionalProperties:
   artifactId: springboot-oneof
   snapshotVersion: "true"
   hideGenerationTimestamp: "true"
+  generateBuilders: true

bin/configs/spring-boot-useoptional.yaml

@@ -8,3 +8,4 @@ additionalProperties:
   useOptional: true
   artifactId: spring-boot-useoptional
   hideGenerationTimestamp: "true"
+  generateBuilders: true

bin/utils/test_file_list.yaml

@@ -8,9 +8,9 @@
   sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230
 # java okhttp gson test files
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java"
-  sha256: db505f7801fef62c13a08a8e9ca1fc4c5c947ab46b46f12943139d353feacf17
+  sha256: 325fdd5d7e2c97790c0fb44f712ab7b2ba022d7e1a5b0056f47b07f342682b6d
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java"
-  sha256: 8210bdaf06aae8dc46521515a8a0ef10e48c980fadd3efd95313e6c806f409c2
+  sha256: e673d9928c8eb848262d0116fe0d28db832e128671a810a7c966d06d90cb9b63
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java"
   sha256: 0d64cdc11809a7b5b952ccdad2bd91bd0045b3894d6fabf3e368fa0be12b8217
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java"

docs/generators/cpp-pistache-server.md

@@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ---------- | ------- |
 |nlohmann::json|#include <nlohmann/json.hpp>|
 |std::map|#include <map>|
+|std::set|#include <set>|
 |std::string|#include <string>|
 |std::vector|#include <vector>|
 

docs/generators/cpp-restsdk.md

@@ -36,6 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |HttpContent|#include "HttpContent.h"|
 |Object|#include "Object.h"|
 |std::map|#include <map>|
+|std::set|#include <set>|
 |std::string|#include <string>|
 |std::vector|#include <vector>|
 |utility::datetime|#include <cpprest/details/basic_types.h>|

docs/generators/groovy.md

@@ -39,6 +39,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
+|generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|

docs/generators/java-camel.md

@@ -55,6 +55,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**source**</dt><dd>Publish the original input OpenAPI specification.</dd><dt>**springfox**</dt><dd>Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using SpringFox 2.x. Deprecated (for removal); use springdoc instead.</dd><dt>**springdoc**</dt><dd>Generate an OpenAPI 3 specification using SpringDoc.</dd></dl>|springdoc|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
+|generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
 |generatedConstructorWithRequiredArgs|Whether to generate constructors with required args for models| |true|
 |groupId|groupId in generated pom.xml| |org.openapitools|

docs/generators/java-helidon-client.md

@@ -38,9 +38,10 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
 |fullProject|If set to true, it will generate all files; if set to false, it will only generate API files. If unspecified, the behavior depends on whether a project exists or not: if it does not, same as true; if it does, same as false. Note that test files are never overwritten.| ||
+|generateBuilders|Whether to generate builders for models| |false|
 |generateConstructorWithAllArgs|whether to generate a constructor for all arguments| |false|
 |groupId|groupId in generated pom.xml| |org.openapitools|
-|helidonVersion|Helidon version for generated code| |3.0.1|
+|helidonVersion|Helidon complete version identifier or major version number. The specified exact Helidon release or, if specified as a major version the latest release of that major version,  is used in the generated code.| |Highest released version.|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |false|
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |implicitHeaders|Skip header parameters in the generated API methods using @ApiImplicitParams annotation.| |false|