Merge branch 'main' into mock-module

Author: mcruzdev

.all-contributorsrc

@@ -387,6 +387,37 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "andybarilla",
+      "name": "Andy Barilla",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5983808?v=4",
+      "profile": "https://kranzilla.com/",
+      "contributions": [
+        "code",
+        "test",
+        "doc"
+      ]
+    },
+    {
+      "login": "yuhaibohotmail",
+      "name": "yuhaibohotmail",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48646226?v=4",
+      "profile": "https://github.com/yuhaibohotmail",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "JPSantistebanQ",
+      "name": "Juan Piero Santisteban Quiroz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49204973?v=4",
+      "profile": "https://jpsantistebanq.github.io/portfolio",
+      "contributions": [
+        "code",
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/project.yml

@@ -1,3 +1,3 @@
 release:
-  current-version: 2.6.0
+  current-version: 2.8.0
   next-version: 3.0.0-SNAPSHOT

.github/workflows/preview.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
     steps:
       - name: Download PR Artifact
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v8
         with:
           workflow: ${{ github.event.workflow_run.workflow_id }}
           workflow_conclusion: success

.github/workflows/quarkus-snapshot.yaml

@@ -26,9 +26,6 @@ jobs:
     if: github.actor == 'quarkusbot' || github.actor == 'quarkiversebot' || github.actor == '<ADMIN>'
 
     steps:
-      - name: Install yq
-        run: sudo add-apt-repository ppa:rmescandon/yq && sudo apt update && sudo apt install yq -y
-
       - name: Set up Java
         uses: actions/setup-java@v4
         with:

.github/workflows/snapshot_deploy.yml

@@ -3,6 +3,7 @@ name: Snapshot Deploy
 concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
+
 on:
   workflow_dispatch:
   push:
@@ -12,28 +13,16 @@ defaults:
   run:
     shell: bash
 
+permissions:
+  attestations: write
+  id-token: write
+  contents: read
+
 jobs:
   deploy-snapshot:
-    runs-on: ubuntu-latest
-    name: Deploy Snapshot artifacts
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 17
-          cache: 'maven'
-          server-id: 'ossrh'
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
-
-      - name: Deploy ${{steps.metadata.outputs.next-version}}
-        run: |
-          mvn -B clean deploy -DskipTests -DperformRelease=true -Drelease
-        env:
-            MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-            MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-            MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+    name: Deploy Snapshots
+    uses: quarkiverse/.github/.github/workflows/perform-release.yml@main
+    secrets: inherit
+    with:
+      ref: main
+      version: 3.0.0-SNAPSHOT

.github/workflows/stale_issues.yml

@@ -11,7 +11,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.0.0
+      - uses: actions/stale@v9.1.0
         with:
           exempt-issue-labels: "pinned"
           stale-issue-message: "@ricardozanini @hbelmiro This is being labeled as Stale."

README.md

@@ -8,33 +8,32 @@
 <br>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-41-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-44-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)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat-square)](https://opensource.org/licenses/Apache-2.0)
 
-
-> **⚠️** This is the instructions for the latest SNAPSHOT version (main branch). Please, see the [latest **released** documentation](https://docs.quarkiverse.io/quarkus-openapi-generator/dev/index.html) if you are looking for instructions.
-
-> **⚠️** This extension, [like Quarkus 3.7](https://quarkus.io/blog/java-17/), requires Java 17. The last version of this extension that supports earlier versions of Java is [2.2.16](https://github.com/quarkiverse/quarkus-openapi-generator/releases/tag/2.2.16).
-
-> **⚠️** Check versions 1.x.x if you're still using Quarkus 2. But be aware that we no longer support Quarkus 2. That means there are no updates planned for those versions.
-
 Quarkus' extensions for generation of [Rest Clients](https://quarkus.io/guides/rest-client) and server stubs generation based on the [Apicurio Codegen](https://github.com/Apicurio/apicurio-codegen) capabilities based on OpenAPI specification files.
 
-This client-side extension is based on the [OpenAPI Generator Tool](https://openapi-generator.tech/). Please consider donation to help them maintain the
+This client-side extension is based on the [OpenAPI Generator Tool](https://openapi-generator.tech/). Please consider a donation to help them maintain the
 project: https://opencollective.com/openapi_generator/donate
 
-This repository holds two Quarkus extensions. The one located on the client folder is for REST code generation for client side only. The extension located in the server folder can be used for server stubs generation.
+This repository holds two Quarkus extensions. The one located in the client folder is for REST code generation for client-side only. The extension located in the server folder can be used for server stubs generation.
+
+> [!WARNING]
+> This extension, [like Quarkus 3.7](https://quarkus.io/blog/java-17/), requires Java 17. The last version of this extension that supports earlier versions of Java is [2.2.16](https://github.com/quarkiverse/quarkus-openapi-generator/releases/tag/2.2.16).
+
+> [!CAUTION]
+> Check versions 1.x.x if you're still using Quarkus 2. But be aware that we no longer support Quarkus 2. That means there are no updates planned for those versions.
 
 **Want to contribute? Great!** We try to make it easy, and all contributions, even the smaller ones, are more than welcome. This includes bug reports, fixes, documentation, examples... But first, read [this page](CONTRIBUTING.md).
 
 ## Getting Started
 
 You can learn more in [Quarkus Openapi Generator Documentation](http://docs.quarkiverse.io/quarkus-openapi-generator/dev/index.html).
 
-
+> [!TIP]
 > If you want to improve the docs, please feel free to contribute editing the docs in [Docs](https://github.com/quarkiverse/quarkus-openapi-generator/tree/main/docs/modules/ROOT). But first, read [this page](CONTRIBUTING.md).
 
 ## Contributors ✨
@@ -98,6 +97,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <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>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rednalyn"><img src="https://avatars.githubusercontent.com/u/31593992?v=4?s=100" width="100px;" alt="rednalyn"/><br /><sub><b>rednalyn</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=rednalyn" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/marko-bekhta"><img src="https://avatars.githubusercontent.com/u/4004823?v=4?s=100" width="100px;" alt="Marko Bekhta"/><br /><sub><b>Marko Bekhta</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=marko-bekhta" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://kranzilla.com/"><img src="https://avatars.githubusercontent.com/u/5983808?v=4?s=100" width="100px;" alt="Andy Barilla"/><br /><sub><b>Andy Barilla</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=andybarilla" title="Code">💻</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=andybarilla" title="Tests">⚠️</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=andybarilla" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yuhaibohotmail"><img src="https://avatars.githubusercontent.com/u/48646226?v=4?s=100" width="100px;" alt="yuhaibohotmail"/><br /><sub><b>yuhaibohotmail</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=yuhaibohotmail" title="Code">💻</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=yuhaibohotmail" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jpsantistebanq.github.io/portfolio"><img src="https://avatars.githubusercontent.com/u/49204973?v=4?s=100" width="100px;" alt="Juan Piero Santisteban Quiroz"/><br /><sub><b>Juan Piero Santisteban Quiroz</b></sub></a><br /><a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=JPSantistebanQ" title="Code">💻</a> <a href="https://github.com/quarkiverse/quarkus-openapi-generator/commits?author=JPSantistebanQ" title="Tests">⚠️</a></td>
     </tr>
   </tbody>
 </table>

client/deployment/pom.xml

@@ -11,10 +11,10 @@
   <name>Quarkus - Openapi Generator - Client - Deployment</name>
 
   <properties>
-    <version.org.openapitools>7.8.0</version.org.openapitools>
+    <version.org.openapitools>7.11.0</version.org.openapitools>
     <version.org.slf4j>2.0.16</version.org.slf4j>
     <version.com.github.jknack>4.3.1</version.com.github.jknack>
-    <version.io.swagger.parser>2.1.24</version.io.swagger.parser>
+    <version.io.swagger.parser>2.1.25</version.io.swagger.parser>
   </properties>
 
   <dependencies>
@@ -36,6 +36,11 @@
       <artifactId>quarkus-openapi-generator</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.quarkiverse.openapi.generator</groupId>
+      <artifactId>quarkus-openapi-generator-oidc</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <!-- Forces swagger-parser version to avoid conflict with Quarkus.
     This is needed while org.openapitools:openapi-generator doesn't use swagger-parser 2.1.13 or greater -->
     <dependency>
@@ -164,9 +169,6 @@
                   <version>${quarkus.version}</version>
                 </path>
               </annotationProcessorPaths>
-              <compilerArgs>
-                <arg>-AlegacyConfigRoot=true</arg>
-              </compilerArgs>
             </configuration>
           </execution>
         </executions>

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

@@ -7,30 +7,32 @@
 import java.util.stream.Collectors;
 
 import io.quarkiverse.openapi.generator.deployment.codegen.OpenApiGeneratorOutputPaths;
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithName;
 import io.smallrye.config.common.utils.StringUtil;
 
 // This configuration is read in codegen phase (before build time), the annotation is for document purposes and avoiding quarkus warns
-@ConfigRoot(name = CodegenConfig.CODEGEN_TIME_CONFIG_PREFIX, phase = ConfigPhase.BUILD_TIME)
-public class CodegenConfig extends GlobalCodegenConfig {
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+@ConfigMapping(prefix = "quarkus." + CodegenConfig.CODEGEN_TIME_CONFIG_PREFIX)
+public interface CodegenConfig extends GlobalCodegenConfig {
 
-    static final String CODEGEN_TIME_CONFIG_PREFIX = "openapi-generator.codegen";
+    String CODEGEN_TIME_CONFIG_PREFIX = "openapi-generator.codegen";
 
-    public static final String API_PKG_SUFFIX = ".api";
-    public static final String MODEL_PKG_SUFFIX = ".model";
+    String API_PKG_SUFFIX = ".api";
+    String MODEL_PKG_SUFFIX = ".model";
 
-    public static final String ADDITIONAL_ENUM_TYPE_UNEXPECTED_MEMBER_NAME_DEFAULT = "UNEXPECTED";
-    public static final String ADDITIONAL_ENUM_TYPE_UNEXPECTED_MEMBER_STRING_VALUE_DEFAULT = "unexpected";
+    String ADDITIONAL_ENUM_TYPE_UNEXPECTED_MEMBER_NAME_DEFAULT = "UNEXPECTED";
+    String ADDITIONAL_ENUM_TYPE_UNEXPECTED_MEMBER_STRING_VALUE_DEFAULT = "unexpected";
     // package visibility for unit tests
-    static final String BUILD_TIME_GLOBAL_PREFIX_FORMAT = "quarkus." + CODEGEN_TIME_CONFIG_PREFIX + ".%s";
-    static final String BUILD_TIME_SPEC_PREFIX_FORMAT = "quarkus." + CODEGEN_TIME_CONFIG_PREFIX + ".spec.%s";
+    String BUILD_TIME_GLOBAL_PREFIX_FORMAT = "quarkus." + CODEGEN_TIME_CONFIG_PREFIX + ".%s";
+    String BUILD_TIME_SPEC_PREFIX_FORMAT = "quarkus." + CODEGEN_TIME_CONFIG_PREFIX + ".spec.%s";
 
-    public static final List<String> SUPPORTED_CONFIGURATIONS = Arrays.stream(ConfigName.values()).map(cn -> cn.name)
+    List<String> SUPPORTED_CONFIGURATIONS = Arrays.stream(ConfigName.values()).map(cn -> cn.name)
             .collect(Collectors.toList());
 
-    public enum ConfigName {
+    enum ConfigName {
         //global configs
         VERBOSE("verbose"),
         INPUT_BASE_DIR("input-base-dir"),
@@ -58,6 +60,7 @@ public enum ConfigName {
         ADDITIONAL_API_TYPE_ANNOTATIONS("additional-api-type-annotations"),
         TYPE_MAPPINGS("type-mappings"),
         IMPORT_MAPPINGS("import-mappings"),
+        SCHEMA_MAPPINGS("schema-mappings"),
         NORMALIZER("open-api-normalizer"),
         RETURN_RESPONSE("return-response"),
         ENABLE_SECURITY_GENERATION("enable-security-generation"),
@@ -67,7 +70,14 @@ public enum ConfigName {
         USE_FIELD_NAME_IN_PART_FILENAME("use-field-name-in-part-filename"),
         ADDITIONAL_PROPERTIES_AS_ATTRIBUTE("additional-properties-as-attribute"),
         ADDITIONAL_REQUEST_ARGS("additional-request-args"),
-        BEAN_VALIDATION("use-bean-validation");
+        REMOVE_OPERATION_ID_PREFIX("remove-operation-id-prefix"),
+        REMOVE_OPERATION_ID_PREFIX_DELIMITER("remove-operation-id-prefix-delimiter"),
+        REMOVE_OPERATION_ID_PREFIX_COUNT("remove-operation-id-prefix-count"),
+        GENERATE_APIS("generate-apis"),
+        GENERATE_MODELS("generate-models"),
+        BEAN_VALIDATION("use-bean-validation"),
+        SERIALIZABLE_MODEL("serializable-model"),
+        EQUALS_HASHCODE("equals-hashcode");
 
         private final String name;
 
@@ -80,28 +90,28 @@ public enum ConfigName {
     /**
      * OpenAPI Spec details for codegen configuration.
      */
-    @ConfigItem(name = "spec")
-    public Map<String, SpecItemConfig> specItem;
+    @WithName("spec")
+    Map<String, SpecItemConfig> specItem();
 
-    public static String resolveApiPackage(final String basePackage) {
+    static String resolveApiPackage(final String basePackage) {
         return String.format("%s%s", basePackage, API_PKG_SUFFIX);
     }
 
-    public static String resolveModelPackage(final String basePackage) {
+    static String resolveModelPackage(final String basePackage) {
         return String.format("%s%s", basePackage, MODEL_PKG_SUFFIX);
     }
 
     /**
      * Return global config name, openapi-generator.codegen.config-name
      */
-    public static String getGlobalConfigName(ConfigName configName) {
+    static String getGlobalConfigName(ConfigName configName) {
         return String.format(BUILD_TIME_GLOBAL_PREFIX_FORMAT, configName.name);
     }
 
     /**
      * Return spec config name openapi-generator.codegen.spec.%s.config-name
      */
-    public static String getSpecConfigName(ConfigName configName, final Path openApiFilePath) {
+    static String getSpecConfigName(ConfigName configName, final Path openApiFilePath) {
         return String.format("%s.%s", getBuildTimeSpecPropertyPrefix(openApiFilePath), configName.name);
     }
 
@@ -111,7 +121,7 @@ public static String getSpecConfigName(ConfigName configName, final Path openApi
      * returned value is
      * <code>openapi.generator.codegen.spec.petstore.mutiny</code>.
      */
-    public static String getSpecConfigNameByConfigKey(final String configKey, final ConfigName configName) {
+    static String getSpecConfigNameByConfigKey(final String configKey, final ConfigName configName) {
         String buildTimeSpecPropertyPrefix = String.format(BUILD_TIME_SPEC_PREFIX_FORMAT, configKey);
         return String.format("%s.%s", buildTimeSpecPropertyPrefix, configName.name);
     }
@@ -122,11 +132,11 @@ public static String getSpecConfigNameByConfigKey(final String configKey, final
      * `quarkus.openapi-generator."petstore_json"`.
      * Every the periods (.) in the file name will be replaced by underscore (_).
      */
-    public static String getBuildTimeSpecPropertyPrefix(final Path openApiFilePath) {
+    static String getBuildTimeSpecPropertyPrefix(final Path openApiFilePath) {
         return String.format(BUILD_TIME_SPEC_PREFIX_FORMAT, getSanitizedFileName(openApiFilePath));
     }
 
-    public static String getSanitizedFileName(final Path openApiFilePath) {
+    static String getSanitizedFileName(final Path openApiFilePath) {
         return StringUtil
                 .replaceNonAlphanumericByUnderscores(OpenApiGeneratorOutputPaths.getRelativePath(openApiFilePath).toString());
     }