OpenAPITools · wing328 · Aug 4, 2024 · Jun 8, 2024 · Jun 11, 2024 · Jun 12, 2024
diff --git a/.github/workflows/samples-java-helidon-v4.yaml b/.github/workflows/samples-java-helidon-v4.yaml
@@ -18,7 +18,10 @@ jobs:
       matrix:
         sample:
           - samples/client/petstore/java-helidon-client/v4/mp
+          - samples/client/petstore/java-helidon-client/v4/se
           - samples/server/petstore/java-helidon-server/v4/mp
+          - samples/server/petstore/java-helidon-server/v4/se
+          - samples/server/petstore/java-helidon-server/v4/se-uac
         version: [21]
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/samples-jdk21.yaml b/.github/workflows/samples-jdk21.yaml
@@ -4,14 +4,18 @@ on:
     paths:
       # clients
       - samples/client/petstore/java-helidon-client/v4/mp/**
+      - samples/client/petstore/java-helidon-client/v4/se/**
       # servers
       - samples/server/petstore/java-helidon-server/v4/mp/**
+      - samples/server/petstore/java-helidon-server/v4/se/**
   pull_request:
     paths:
       # clients
       - samples/client/petstore/java-helidon-client/v4/mp/**
+      - samples/client/petstore/java-helidon-client/v4/se/**
       # servers
       - samples/server/petstore/java-helidon-server/v4/mp/**
+      - samples/server/petstore/java-helidon-server/v4/se/**
 jobs:
   build:
     name: Build with JDK21
@@ -22,8 +26,10 @@ jobs:
         sample:
           # clients
           - samples/client/petstore/java-helidon-client/v4/mp/
+          - samples/client/petstore/java-helidon-client/v4/se/
           # servers
           - samples/server/petstore/java-helidon-server/v4/mp/
+          - samples/server/petstore/java-helidon-server/v4/se/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

diff --git a/bin/configs/java-helidon-client-mp_4.yaml b/bin/configs/java-helidon-client-mp_4.yaml
@@ -3,7 +3,7 @@ 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
+  helidonVersion: 4.0.11
   artifactId: petstore-helidon-client-mp
   hideGenerationTimestamp: "true"
   configureAuth: "false"

diff --git a/bin/configs/java-helidon-client-se_4.yaml b/bin/configs/java-helidon-client-se_4.yaml
@@ -0,0 +1,14 @@
+generatorName: java-helidon-client
+library: se
+outputDir: samples/client/petstore/java-helidon-client/v4/se
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+additionalProperties:
+  helidonVersion: 4.0.11
+  artifactId: petstore-helidon-client-se
+  hideGenerationTimestamp: "true"
+  configureAuth: "false"
+  build: "all"
+  test: "spock"
+  requiredPropertiesInConstructor: "false"
+  visitable: "true"
+  fullProject: "true"
diff --git a/bin/configs/java-helidon-server-mp_4.yaml b/bin/configs/java-helidon-server-mp_4.yaml
@@ -4,7 +4,7 @@ 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
+  helidonVersion: 4.0.11
   artifactId: petstore-helidon-server-mp
   hideGenerationTimestamp: "true"
   build: "all"

diff --git a/bin/configs/java-helidon-server-se_4-uac-group-by-file-path.yaml b/bin/configs/java-helidon-server-se_4-uac-group-by-file-path.yaml
@@ -0,0 +1,13 @@
+generatorName: java-helidon-server
+library: se
+outputDir: samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path
+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.11
+  artifactId: petstore-helidon-server-se
+  hideGenerationTimestamp: "true"
+  fullProject: "true"
+  useAbstractClass: "true"
+  generatorVersion: "stable"
+  x-helidon-groupBy: first-path-segment
diff --git a/bin/configs/java-helidon-server-se_4-uac.yaml b/bin/configs/java-helidon-server-se_4-uac.yaml
@@ -0,0 +1,12 @@
+generatorName: java-helidon-server
+library: se
+outputDir: samples/server/petstore/java-helidon-server/v4/se-uac
+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.11
+  artifactId: petstore-helidon-server-se
+  hideGenerationTimestamp: "true"
+  fullProject: "true"
+  useAbstractClass: "true"
+  generatorVersion: "stable"
diff --git a/bin/configs/java-helidon-server-se_4.yaml b/bin/configs/java-helidon-server-se_4.yaml
@@ -0,0 +1,12 @@
+generatorName: java-helidon-server
+library: se
+outputDir: samples/server/petstore/java-helidon-server/v4/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: 4.0.11
+  artifactId: petstore-helidon-server-se
+  hideGenerationTimestamp: "true"
+  fullProject: "true"
+  x-helidon-useOptional: "true"
+  generatorVersion: "stable"
diff --git a/docs/generators/java-helidon-client.md b/docs/generators/java-helidon-client.md
@@ -65,6 +65,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
+|x-helidon-groupBy|Selects how to group operations into APIs|<dl><dt>**tags**</dt><dd>Use the 'tags' settings on each operation</dd><dt>**first-path-segment**</dt><dd>Use the first segment of the path</dd></dl>|tags|
+|x-helidon-useOptional|Wrap optional parameters in an Optional (Helidon 4 and later)| |true|
 
 ## SUPPORTED VENDOR EXTENSIONS
 

diff --git a/docs/generators/java-helidon-server.md b/docs/generators/java-helidon-server.md
@@ -68,6 +68,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
+|x-helidon-groupBy|Selects how to group operations into APIs|<dl><dt>**tags**</dt><dd>Use the 'tags' settings on each operation</dd><dt>**first-path-segment**</dt><dd>Use the first segment of the path</dd></dl>|tags|
+|x-helidon-useOptional|Wrap optional parameters in an Optional (Helidon 4 and later)| |true|
 
 ## SUPPORTED VENDOR EXTENSIONS
 

diff --git a/...-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java b/...-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java
@@ -65,6 +65,7 @@ public class JavaHelidonClientCodegen extends JavaHelidonCommonCodegen {
 
     private static final String X_HELIDON_REQUIRED_IMPL_IMPORTS = "x-helidon-requiredImplImports";
     private static final String X_HELIDON_IMPL_IMPORTS = "x-helidon-implImports";
+    private static final String X_CLIENT_STYLE_V3 = "x-helidon-client-style-v3";
     public static final String CONFIG_KEY = "configKey";
 
     @Setter protected String configKey = null;
@@ -173,6 +174,8 @@ public String apiFilename(String templateName, String tag) {
     public void processOpts() {
         super.processOpts();
 
+        // Not intended for users to set; we compute this based on the major version.
+        additionalProperties.put(X_CLIENT_STYLE_V3, helidonMajorVersion == 3);
         convertPropertyToStringAndWriteBack(SERIALIZATION_LIBRARY, this::setSerializationLibrary);
 
         convertPropertyToStringAndWriteBack(CONFIG_KEY, this::setConfigKey);
@@ -199,7 +202,12 @@ public void processOpts() {
         } else if (isLibrary(HELIDON_SE)) {
             apiTemplateFiles.put("api_impl.mustache", ".java");
             importMapping.put("StringJoiner", "java.util.StringJoiner");
-            importMapping.put("WebClientRequestHeaders", "io.helidon.webclient.WebClientRequestHeaders");
+            if (helidonMajorVersion == 3) {
+                importMapping.put("WebClientRequestHeaders", "io.helidon.webclient.WebClientRequestHeaders");
+            } else {
+                importMapping.put("ClientRequestHeaders", "io.helidon.http.ClientRequestHeaders");
+                importMapping.put("HeaderNames", "io.helidon.http.HeaderNames");
+            }
             importMapping.put("Pair", invokerPackage + ".Pair");
 
 
@@ -309,7 +317,10 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
             requiredImplImports.add("Pair");
         }
         if (op.getHasHeaderParams()) {
-            requiredImplImports.add("WebClientRequestHeaders");
+            requiredImplImports.add(helidonMajorVersion == 3 ? "WebClientRequestHeaders" : "ClientRequestHeaders");
+            if (helidonMajorVersion > 3) {
+                requiredImplImports.add("HeaderNames");
+            }
         }
         if (op.getHasFormParams()) {
             requiredImplImports.add("StringJoiner");