Merge branch 'main' into mock-module

Author: mcruzdev

.all-contributorsrc

@@ -350,6 +350,25 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "kfebert",
+      "name": "Karl Ferdinand Ebert",
+      "avatar_url": "https://avatars.githubusercontent.com/u/848796?v=4",
+      "profile": "https://github.com/kfebert",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "michalkolenda",
+      "name": "Michał Kolenda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29705783?v=4",
+      "profile": "https://github.com/michalkolenda",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/CODEOWNERS

@@ -0,0 +1,14 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# More details are here: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# The '*' pattern is global owners.
+
+# Order is important. The last matching pattern has the most precedence.
+# The folders are ordered as follows:
+
+# In each subsection folders are ordered first by depth, then alphabetically.
+# This should make it easy to add new rules without breaking existing ones.
+
+*   @quarkiverse/quarkiverse-openapi-generator

README.md

@@ -1,7 +1,7 @@
 # Quarkus - OpenAPI Generator
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-37-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-39-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Build](<https://img.shields.io/github/actions/workflow/status/quarkiverse/quarkus-openapi-generator/build.yml?branch=main&logo=GitHub&style=flat-square>)](https://github.com/quarkiverse/quarkus-openapi-generator/actions?query=workflow%3ABuild)
 [![Maven Central](https://img.shields.io/maven-central/v/io.quarkiverse.openapi.generator/quarkus-openapi-generator.svg?label=Maven%20Central&style=flat-square)](https://search.maven.org/artifact/io.quarkiverse.openapi.generator/quarkus-openapi-generator)
@@ -87,6 +87,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/brice-laurencin"><img src="https://avatars.githubusercontent.com/u/135709187?v=4?s=100" width="100px;" alt="Brice Laurencin"/><br /><sub><b>Brice Laurencin</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=brice-laurencin" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/gmalheiro"><img src="https://avatars.githubusercontent.com/u/92603922?v=4?s=100" width="100px;" alt="Gabriel Malheiro"/><br /><sub><b>Gabriel Malheiro</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=gmalheiro" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kfebert"><img src="https://avatars.githubusercontent.com/u/848796?v=4?s=100" width="100px;" alt="Karl Ferdinand Ebert"/><br /><sub><b>Karl Ferdinand Ebert</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=kfebert" title="Code">💻</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=kfebert" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/michalkolenda"><img src="https://avatars.githubusercontent.com/u/29705783?v=4?s=100" width="100px;" alt="Michał Kolenda"/><br /><sub><b>Michał Kolenda</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=michalkolenda" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

client/deployment/pom.xml

@@ -11,7 +11,7 @@
   <name>Quarkus - Openapi Generator - Client - Deployment</name>
 
   <properties>
-    <version.org.openapitools>7.6.0</version.org.openapitools>
+    <version.org.openapitools>7.8.0</version.org.openapitools>
     <version.org.slf4j>2.0.16</version.org.slf4j>
     <version.com.github.jknack>4.3.1</version.com.github.jknack>
   </properties>
@@ -138,15 +138,23 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>io.quarkus</groupId>
-              <artifactId>quarkus-extension-processor</artifactId>
-              <version>${quarkus.version}</version>
-            </path>
-          </annotationProcessorPaths>
-        </configuration>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <configuration>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>io.quarkus</groupId>
+                  <artifactId>quarkus-extension-processor</artifactId>
+                  <version>${quarkus.version}</version>
+                </path>
+              </annotationProcessorPaths>
+              <compilerArgs>
+                <arg>-AlegacyConfigRoot=true</arg>
+              </compilerArgs>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CodegenConfig.java

@@ -34,6 +34,7 @@ public enum ConfigName {
         //global configs
         VERBOSE("verbose"),
         INPUT_BASE_DIR("input-base-dir"),
+        TEMPLATE_BASE_DIR("template-base-dir"),
         INCLUDE("include"),
         EXCLUDE("exclude"),
         VALIDATE_SPEC("validateSpec"),
@@ -48,6 +49,8 @@ public enum ConfigName {
         //global & spec configs
         SKIP_FORM_MODEL("skip-form-model"),
         MUTINY("mutiny"),
+        MUTINY_RETURN_RESPONSE("mutiny.return-response"),
+        MUTINY_OPERATION_IDS("mutiny.operation-ids"),
         ADDITIONAL_MODEL_TYPE_ANNOTATIONS("additional-model-type-annotations"),
         ADDITIONAL_ENUM_TYPE_UNEXPECTED_MEMBER("additional-enum-type-unexpected-member"),
         ADDITIONAL_ENUM_TYPE_UNEXPECTED_MEMBER_NAME("additional-enum-type-unexpected-member-name"),

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/CommonItemConfig.java

@@ -86,6 +86,41 @@ public class CommonItemConfig {
     @ConfigItem(name = "mutiny")
     public Optional<Boolean> supportMutiny;
 
+    /**
+     * Defines with SmallRye Mutiny enabled if methods should return {@link jakarta.ws.rs.core.Response} or a model. Default is
+     * {@code false}.
+     */
+    @ConfigItem(name = "mutiny.return-response")
+    public Optional<Boolean> mutinyReturnResponse;
+
+    /**
+     * Handles the return type for each operation, depending on the configuration.
+     * The following cases are supported:
+     * <p>
+     * 1. If {@code mutiny} is enabled and the operation ID is specified to return {@code Multi}:
+     * - The return type will be wrapped in {@link io.smallrye.mutiny.Multi}.
+     * - If {@code mutiny.return-response} is enabled, the return type will be
+     * {@link io.smallrye.mutiny.Multi<jakarta.ws.rs.core.Response>}.
+     * - If the operation has a void return type, it will return {@link io.smallrye.mutiny.Multi<jakarta.ws.rs.core.Response>}.
+     * - Otherwise, it will return {@link io.smallrye.mutiny.Multi<returnType>}.
+     * <p>
+     * 2. If {@code mutiny} is enabled and the operation ID is specified to return {@code Uni}:
+     * - The return type will be wrapped in {@link io.smallrye.mutiny.Uni}.
+     * - If {@code mutiny.return-response} is enabled, the return type will be
+     * {@link io.smallrye.mutiny.Uni<jakarta.ws.rs.core.Response>}.
+     * - If the operation has a void return type, it will return {@link io.smallrye.mutiny.Uni<jakarta.ws.rs.core.Response>}.
+     * - Otherwise, it will return {@link io.smallrye.mutiny.Uni<returnType>}.
+     * <p>
+     * 3. If {@code mutiny} is enabled but no specific operation ID is configured for {@code Multi} or {@code Uni}:
+     * - The return type defaults to {@code Uni}.
+     * - If {@code mutiny.return-response} is enabled, the return type will be
+     * {@link io.smallrye.mutiny.Uni<jakarta.ws.rs.core.Response>}.
+     * - If the operation has a void return type, it will return {@link io.smallrye.mutiny.Uni<jakarta.ws.rs.core.Response>}.
+     * - Otherwise, it will return {@link io.smallrye.mutiny.Uni<returnType>}`.
+     */
+    @ConfigItem(name = "mutiny.operation-ids")
+    public Optional<Map<String, String>> mutinyMultiOperationIds;
+
     /**
      * Defines, whether the `PartFilename` ({@link org.jboss.resteasy.reactive.PartFilename} or
      * {@link org.jboss.resteasy.annotations.providers.multipart.PartFilename}) annotation should be generated for
@@ -118,4 +153,4 @@ public class CommonItemConfig {
      */
     @ConfigItem(name = "use-bean-validation")
     public Optional<Boolean> useBeanValidation;
-}
+}

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GlobalCodegenConfig.java

@@ -27,6 +27,12 @@ public class GlobalCodegenConfig extends CommonItemConfig {
     @ConfigItem(name = "input-base-dir")
     public Optional<String> inputBaseDir;
 
+    /**
+     * Option to change the directory where template files must be found.
+     */
+    @ConfigItem(name = "template-base-dir")
+    public Optional<String> templateBaseDir;
+
     /**
      * Whether or not to skip validating the input spec prior to generation. By default, invalid specifications will result in
      * an error.

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/codegen/OpenApiGeneratorCodeGenBase.java

@@ -13,6 +13,7 @@
 import static io.quarkiverse.openapi.generator.deployment.CodegenConfig.ConfigName.INPUT_BASE_DIR;
 import static io.quarkiverse.openapi.generator.deployment.CodegenConfig.ConfigName.MODEL_NAME_PREFIX;
 import static io.quarkiverse.openapi.generator.deployment.CodegenConfig.ConfigName.MODEL_NAME_SUFFIX;
+import static io.quarkiverse.openapi.generator.deployment.CodegenConfig.ConfigName.TEMPLATE_BASE_DIR;
 import static io.quarkiverse.openapi.generator.deployment.CodegenConfig.ConfigName.VALIDATE_SPEC;
 
 import java.io.IOException;
@@ -119,7 +120,9 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
             }
 
             try (Stream<Path> openApiFilesPaths = Files.walk(openApiDir)) {
-                Path templateDir = context.workDir().resolve("classes").resolve("templates");
+                Optional<String> templateBaseDir = getTemplateBaseDirRelativeToSourceRoot(context.inputDir(), context.config());
+                Path templateDir = templateBaseDir.map(Path::of)
+                        .orElseGet(() -> context.workDir().resolve("classes").resolve("templates"));
                 openApiFilesPaths
                         .filter(Files::isRegularFile)
                         .filter(path -> {
@@ -232,6 +235,10 @@ protected void generate(final Config config, final Path openApiFilePath, final P
         generator.withReturnResponse(
                 getValues(config, openApiFilePath, CodegenConfig.ConfigName.RETURN_RESPONSE, Boolean.class).orElse(false));
 
+        generator.withMutinyReturnResponse(
+                getValues(config, openApiFilePath, CodegenConfig.ConfigName.MUTINY_RETURN_RESPONSE, Boolean.class)
+                        .orElse(false));
+
         generator.withEnabledSecurityGeneration(
                 getValues(config, openApiFilePath, CodegenConfig.ConfigName.ENABLE_SECURITY_GENERATION, Boolean.class)
                         .orElse(true));
@@ -266,6 +273,9 @@ protected void generate(final Config config, final Path openApiFilePath, final P
                 CodegenConfig.ConfigName.ADDITIONAL_PROPERTIES_AS_ATTRIBUTE, Boolean.class)
                 .orElse(Boolean.FALSE);
 
+        getValues(smallRyeConfig, openApiFilePath, CodegenConfig.ConfigName.MUTINY_OPERATION_IDS, String.class, String.class)
+                .ifPresent(generator::withMutinyReturnTypes);
+
         generator.withAdditionalPropertiesAsAttribute(additionalPropertiesAsAttribute);
         GlobalSettings.setProperty(
                 OpenApiClientGeneratorWrapper.SUPPORTS_ADDITIONAL_PROPERTIES_AS_ATTRIBUTE,
@@ -292,8 +302,7 @@ private static OpenApiClientGeneratorWrapper createGeneratorWrapper(Path openApi
     }
 
     private String getBasePackage(final Config config, final Path openApiFilePath) {
-        return config
-                .getOptionalValue(getSpecConfigName(BASE_PACKAGE, openApiFilePath), String.class)
+        return getValues(config, openApiFilePath, BASE_PACKAGE, String.class)
                 .orElse(String.format("%s.%s", DEFAULT_PACKAGE, getSanitizedFileName(openApiFilePath)));
     }
 
@@ -312,9 +321,16 @@ private Optional<String> getModelNamePrefix(final Config config, final Path open
     }
 
     private Optional<String> getInputBaseDirRelativeToModule(final Path sourceDir, final Config config) {
-        return config.getOptionalValue(getGlobalConfigName(INPUT_BASE_DIR), String.class).map(inputBaseDir -> {
+        return config.getOptionalValue(getGlobalConfigName(INPUT_BASE_DIR), String.class).map(baseDir -> {
             int srcIndex = sourceDir.toString().lastIndexOf("src");
-            return srcIndex < 0 ? null : sourceDir.toString().substring(0, srcIndex) + inputBaseDir;
+            return srcIndex < 0 ? null : sourceDir.toString().substring(0, srcIndex) + baseDir;
+        });
+    }
+
+    private Optional<String> getTemplateBaseDirRelativeToSourceRoot(final Path sourceDir, final Config config) {
+        return config.getOptionalValue(getGlobalConfigName(TEMPLATE_BASE_DIR), String.class).map(baseDir -> {
+            int srcIndex = sourceDir.toString().lastIndexOf(inputDirectory());
+            return srcIndex < 0 ? null : sourceDir.toString().substring(0, srcIndex) + baseDir;
         });
     }
 

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/OpenApiClientGeneratorWrapper.java

@@ -12,6 +12,7 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -117,6 +118,21 @@ public OpenApiClientGeneratorWrapper withMutiny(final Boolean config) {
         return this;
     }
 
+    public OpenApiClientGeneratorWrapper withMutinyReturnResponse(final Boolean config) {
+        if (config != null) {
+            configurator.addAdditionalProperty("mutiny-return-response", config);
+        }
+        return this;
+    }
+
+    public OpenApiClientGeneratorWrapper withMutinyReturnTypes(final Map<String, String> returnTypeMappings) {
+        if (returnTypeMappings != null && !returnTypeMappings.isEmpty()) {
+            Map<String, Object> mutinyOperationIdsMap = new HashMap<>(returnTypeMappings);
+            configurator.addAdditionalProperty("mutiny-operation-ids", mutinyOperationIdsMap);
+        }
+        return this;
+    }
+
     /**
      * Sets the global 'skipFormModel' setting. If not set this setting will default to true.
      *

client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/wrapper/QuarkusJavaClientCodegen.java

@@ -140,7 +140,7 @@ public String toEnumVarName(String value, String datatype) {
             return this.getSymbolName(value).toUpperCase(Locale.ROOT);
         }
 
-        String enumVarName = super.toEnumVarName(value, datatype);
+        String enumVarName = super.toEnumVarName(value.toLowerCase(Locale.ROOT), datatype);
 
         if (enumVarName.startsWith("NUMBER_")) {
             return enumVarName;
@@ -189,4 +189,4 @@ private void configureAdditionalPropertiesAsAttribute() {
             this.supportsAdditionalPropertiesWithComposedSchema = true;
         }
     }
-}
+}