Merge branch 'main' into mock-module

Author: mcruzdev

.all-contributorsrc

@@ -369,6 +369,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "rednalyn",
+      "name": "rednalyn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31593992?v=4",
+      "profile": "https://github.com/rednalyn",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "marko-bekhta",
+      "name": "Marko Bekhta",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4004823?v=4",
+      "profile": "https://github.com/marko-bekhta",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/project.yml

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

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "main-lts"
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'
@@ -27,7 +28,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [
+          ubuntu-latest,
+#          windows-latest - Disabled due to https://github.com/quarkiverse/quarkus-openapi-generator/pull/836#issuecomment-2457329495
+        ]
         java: [
           { 'version': '17' },
           { 'version': '21' }
@@ -53,7 +57,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [
+          ubuntu-latest,
+#          windows-latest - Disabled due to https://github.com/quarkiverse/quarkus-openapi-generator/pull/836#issuecomment-2457329495
+        ]
         java: [
           { 'version': '17' },
           { 'version': '21' }

.github/workflows/build_website.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - "main-lts"
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "main-lts" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "main-lts" ]
   schedule:
     - cron: "2 0 * * 6"
 

README.md

@@ -1,7 +1,14 @@
+
+<div align="center">
+
+<img src="https://github.com/quarkiverse/.github/blob/main/assets/images/quarkus.svg" width="67" height="70" ><img src="https://github.com/quarkiverse/.github/blob/main/assets/images/plus-sign.svg" height="70" ><img src="https://github.com/quarkiverse/quarkus-openapi-generator/blob/main/docs/modules/ROOT/assets/images/openapi.svg" height="70" >
+
 # Quarkus - OpenAPI Generator
+</div>
+<br>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-39-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-41-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)
@@ -89,6 +96,8 @@ 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/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>
+      <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>
     </tr>
   </tbody>
 </table>

client/deployment/pom.xml

@@ -14,6 +14,7 @@
     <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>
+    <version.io.swagger.parser>2.1.24</version.io.swagger.parser>
   </properties>
 
   <dependencies>

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

@@ -1,5 +1,7 @@
 package io.quarkiverse.openapi.generator.deployment;
 
+import static io.quarkus.bootstrap.classloading.QuarkusClassLoader.isClassPresentAtRuntime;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -48,9 +50,10 @@ public class GeneratorProcessor {
     private static final DotName BASIC_AUTHENTICATION_MARKER = DotName.createSimple(BasicAuthenticationMarker.class);
     private static final DotName BEARER_AUTHENTICATION_MARKER = DotName.createSimple(BearerAuthenticationMarker.class);
     private static final DotName API_KEY_AUTHENTICATION_MARKER = DotName.createSimple(ApiKeyAuthenticationMarker.class);
-
     private static final DotName OPERATION_MARKER = DotName.createSimple(OperationMarker.class);
 
+    private static final String ABSTRACT_TOKEN_PRODUCER = "io.quarkus.oidc.client.runtime.AbstractTokensProducer";
+
     @BuildStep
     FeatureBuildItem feature() {
         return new FeatureBuildItem(FEATURE);
@@ -61,6 +64,10 @@ void additionalBean(
             Capabilities capabilities,
             BuildProducer<AdditionalBeanBuildItem> producer) {
 
+        if (!isClassPresentAtRuntime(ABSTRACT_TOKEN_PRODUCER)) {
+            return;
+        }
+
         if (capabilities.isPresent(Capability.REST_CLIENT_REACTIVE)) {
             producer.produce(
                     AdditionalBeanBuildItem.builder().addBeanClass(ReactiveOidcClientRequestFilterDelegate.class)
@@ -103,10 +110,15 @@ void produceCompositeProviders(AuthenticationRecorder recorder,
 
     @BuildStep
     @Record(ExecutionTime.STATIC_INIT)
-    void produceOauthAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
+    void produceOauthAuthentication(
+            CombinedIndexBuildItem beanArchiveBuildItem,
             BuildProducer<AuthProviderBuildItem> authenticationProviders,
             BuildProducer<SyntheticBeanBuildItem> beanProducer,
             AuthenticationRecorder recorder) {
+
+        if (!isClassPresentAtRuntime(ABSTRACT_TOKEN_PRODUCER)) {
+            return;
+        }
         Collection<AnnotationInstance> authenticationMarkers = beanArchiveBuildItem.getIndex()
                 .getAnnotationsWithRepeatable(OAUTH_AUTHENTICATION_MARKER, beanArchiveBuildItem.getIndex());
 

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

@@ -7,7 +7,6 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +28,7 @@ public static void validateInputConfiguration(List<String> configNames) throws C
                 .filter(pn -> pn.startsWith("quarkus.openapi-generator.codegen"))
                 .map(CONFIG_PATTERN::matcher)
                 .filter(Matcher::find)
-                .collect(Collectors.toList());
+                .toList();
 
         if (!userOpenApiConfigurations.isEmpty()) {
             Set<String> unsupportedConfigNames = new HashSet<>();

client/deployment/src/main/resources/templates/libraries/microprofile/auth/compositeAuthenticationProvider.qute

@@ -22,7 +22,7 @@ package {apiPackage}.auth;
 public class CompositeAuthenticationProvider implements jakarta.ws.rs.client.ClientRequestFilter {
 
     @jakarta.inject.Inject
-    @io.quarkiverse.openapi.generator.OpenApiSpec(openApiSpecId="{configKey}")
+    @io.quarkiverse.openapi.generator.OpenApiSpec(openApiSpecId="{quarkus-generator.openApiSpecId}")
     io.quarkiverse.openapi.generator.providers.CompositeAuthenticationProvider compositeProvider;
 
     @java.lang.Override