add AuthName qualifier to fix mutliple synthetic bean with same signature issue

rmanibus · rmanibus · commit 44e9b5c927d7 · 2024-09-15T09:23:06.000-04:00
diff --git a/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GeneratorProcessor.java b/client/deployment/src/main/java/io/quarkiverse/openapi/generator/deployment/GeneratorProcessor.java
@@ -74,12 +74,12 @@ void produceCompositeProviders(AuthenticationRecorder recorder,
             beanProducer.produce(SyntheticBeanBuildItem.configure(CompositeAuthenticationProvider.class)
                     .scope(Dependent.class)
                     .addQualifier()
-                    .annotation(Authentication.class)
+                    .annotation(OpenApiSpec.class)
                     .addValue("openApiSpecId", openApiSpecId)
                     .done()
                     .addInjectionPoint(
                             ParameterizedType.create(Instance.class, ClassType.create(AuthProvider.class)),
-                            AnnotationInstance.builder(Authentication.class)
+                            AnnotationInstance.builder(OpenApiSpec.class)
                                     .add("openApiSpecId", openApiSpecId)
                                     .build())
                     .createWith(recorder.recordCompositeProvider(openApiSpecId))
@@ -91,12 +91,11 @@ void produceCompositeProviders(AuthenticationRecorder recorder,
     @BuildStep
     @Record(ExecutionTime.STATIC_INIT)
     void produceOauthAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
-            Capabilities capabilities,
             BuildProducer<AuthProviderBuildItem> authenticationProviders,
             BuildProducer<SyntheticBeanBuildItem> beanProducer,
             AuthenticationRecorder recorder) {
         Collection<AnnotationInstance> authenticationMarkers = beanArchiveBuildItem.getIndex()
-                .getAnnotations(OAUTH_AUTHENTICATION_MARKER);
+                .getAnnotationsWithRepeatable(OAUTH_AUTHENTICATION_MARKER, beanArchiveBuildItem.getIndex());
 
         Map<String, List<AnnotationInstance>> operationsBySpec = getOperationsBySpec(beanArchiveBuildItem);
 
@@ -108,7 +107,11 @@ void produceOauthAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
             beanProducer.produce(SyntheticBeanBuildItem.configure(AuthProvider.class)
                     .scope(Dependent.class)
                     .addQualifier()
-                    .annotation(Authentication.class)
+                    .annotation(AuthName.class)
+                    .addValue("name", name)
+                    .done()
+                    .addQualifier()
+                    .annotation(OpenApiSpec.class)
                     .addValue("openApiSpecId", openApiSpecId)
                     .done()
                     .addInjectionPoint(ClassType.create(OidcClientRequestFilterDelegate.class),
@@ -132,7 +135,7 @@ void produceBasicAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
             AuthenticationRecorder recorder) {
 
         Collection<AnnotationInstance> authenticationMarkers = beanArchiveBuildItem.getIndex()
-                .getAnnotations(BASIC_AUTHENTICATION_MARKER);
+                .getAnnotationsWithRepeatable(BASIC_AUTHENTICATION_MARKER, beanArchiveBuildItem.getIndex());
 
         Map<String, List<AnnotationInstance>> operationsBySpec = getOperationsBySpec(beanArchiveBuildItem);
         for (AnnotationInstance authenticationMarker : authenticationMarkers) {
@@ -146,7 +149,11 @@ void produceBasicAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
             beanProducer.produce(SyntheticBeanBuildItem.configure(AuthProvider.class)
                     .scope(Dependent.class)
                     .addQualifier()
-                    .annotation(Authentication.class)
+                    .annotation(AuthName.class)
+                    .addValue("name", name)
+                    .done()
+                    .addQualifier()
+                    .annotation(OpenApiSpec.class)
                     .addValue("openApiSpecId", openApiSpecId)
                     .done()
                     .createWith(recorder.recordBasicAuthProvider(
@@ -166,7 +173,7 @@ void produceBearerAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
             AuthenticationRecorder recorder) {
 
         Collection<AnnotationInstance> authenticationMarkers = beanArchiveBuildItem.getIndex()
-                .getAnnotations(BEARER_AUTHENTICATION_MARKER);
+                .getAnnotationsWithRepeatable(BEARER_AUTHENTICATION_MARKER, beanArchiveBuildItem.getIndex());
 
         Map<String, List<AnnotationInstance>> operationsBySpec = getOperationsBySpec(beanArchiveBuildItem);
         for (AnnotationInstance authenticationMarker : authenticationMarkers) {
@@ -179,7 +186,11 @@ void produceBearerAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
             beanProducer.produce(SyntheticBeanBuildItem.configure(AuthProvider.class)
                     .scope(Dependent.class)
                     .addQualifier()
-                    .annotation(Authentication.class)
+                    .annotation(AuthName.class)
+                    .addValue("name", name)
+                    .done()
+                    .addQualifier()
+                    .annotation(OpenApiSpec.class)
                     .addValue("openApiSpecId", openApiSpecId)
                     .done()
                     .createWith(recorder.recordBearerAuthProvider(
@@ -201,7 +212,7 @@ void produceApiKeyAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
             AuthenticationRecorder recorder) {
 
         Collection<AnnotationInstance> authenticationMarkers = beanArchiveBuildItem.getIndex()
-                .getAnnotations(API_KEY_AUTHENTICATION_MARKER);
+                .getAnnotationsWithRepeatable(API_KEY_AUTHENTICATION_MARKER, beanArchiveBuildItem.getIndex());
         Map<String, List<AnnotationInstance>> operationsBySpec = getOperationsBySpec(beanArchiveBuildItem);
         for (AnnotationInstance authenticationMarker : authenticationMarkers) {
             String name = authenticationMarker.value("name").asString();
@@ -216,7 +227,11 @@ void produceApiKeyAuthentication(CombinedIndexBuildItem beanArchiveBuildItem,
             beanProducer.produce(SyntheticBeanBuildItem.configure(AuthProvider.class)
                     .scope(Dependent.class)
                     .addQualifier()
-                    .annotation(Authentication.class)
+                    .annotation(AuthName.class)
+                    .addValue("name", name)
+                    .done()
+                    .addQualifier()
+                    .annotation(OpenApiSpec.class)
                     .addValue("openApiSpecId", openApiSpecId)
                     .done()
                     .createWith(recorder.recordApiKeyAuthProvider(
diff --git a/client/deployment/src/main/resources/templates/libraries/microprofile/auth/compositeAuthenticationProvider.qute b/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.Authentication(openApiSpecId="{configKey}")
+    @io.quarkiverse.openapi.generator.OpenApiSpec(openApiSpecId="{configKey}")
     io.quarkiverse.openapi.generator.providers.CompositeAuthenticationProvider compositeProvider;
 
     @java.lang.Override
diff --git a/client/deployment/src/main/resources/templates/libraries/microprofile/auth/headersFactory.qute b/client/deployment/src/main/resources/templates/libraries/microprofile/auth/headersFactory.qute
@@ -3,7 +3,7 @@ package {apiPackage}.auth;
 public class AuthenticationPropagationHeadersFactory extends io.quarkiverse.openapi.generator.providers.AbstractAuthenticationPropagationHeadersFactory {
 
     @jakarta.inject.Inject
-    public AuthenticationPropagationHeadersFactory(@io.quarkiverse.openapi.generator.Authentication(openApiSpecId="{configKey}") io.quarkiverse.openapi.generator.providers.CompositeAuthenticationProvider compositeProvider, io.quarkiverse.openapi.generator.OpenApiGeneratorConfig generatorConfig, io.quarkiverse.openapi.generator.providers.HeadersProvider headersProvider) {
+    public AuthenticationPropagationHeadersFactory(@io.quarkiverse.openapi.generator.OpenApiSpec(openApiSpecId="{configKey}") io.quarkiverse.openapi.generator.providers.CompositeAuthenticationProvider compositeProvider, io.quarkiverse.openapi.generator.OpenApiGeneratorConfig generatorConfig, io.quarkiverse.openapi.generator.providers.HeadersProvider headersProvider) {
         super(compositeProvider, generatorConfig, headersProvider);
     }
 
diff --git a/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/authentication/OpenApiSpecProviderTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/authentication/OpenApiSpecProviderTest.java
@@ -2,6 +2,7 @@
 
 import static io.quarkiverse.openapi.generator.providers.ApiKeyIn.header;
 
+import jakarta.annotation.Priority;
 import jakarta.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -11,25 +12,27 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkiverse.openapi.generator.Authentication;
+import io.quarkiverse.openapi.generator.OpenApiSpec;
 import io.quarkiverse.openapi.generator.markers.ApiKeyAuthenticationMarker;
 import io.quarkiverse.openapi.generator.markers.BasicAuthenticationMarker;
 import io.quarkiverse.openapi.generator.markers.OauthAuthenticationMarker;
 import io.quarkiverse.openapi.generator.providers.*;
 import io.quarkus.test.QuarkusUnitTest;
 
-public class AuthenticationProviderTest {
+public class OpenApiSpecProviderTest {
 
     @RegisterExtension
     static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClass(LocalAuthenticationProvider.class)
                     .addAsResource(
-                            new StringAsset("quarkus.oidc-client.oauth_auth.auth-server-url=localhost\n"),
+                            new StringAsset("quarkus.oidc-client.oauth_auth.auth-server-url=localhost\n" +
+                                    "quarkus.oidc-client.oauth_auth1.auth-server-url=localhost\n" +
+                                    "quarkus.oidc-client.oauth_auth2.auth-server-url=localhost\n"),
                             "application.properties"));
 
     @Test
-    public void test() {
+    public void checkCompositeProvider() {
         Assertions.assertEquals(1, spec1CompositeProvider.getAuthenticationProviders().size());
         Assertions.assertEquals(1, spec2CompositeProvider.getAuthenticationProviders().size());
         Assertions.assertEquals(1, spec3CompositeProvider.getAuthenticationProviders().size());
@@ -51,22 +54,38 @@ public void test() {
 
     }
 
+    @Test
+    public void checkCompositeProviderWithMultipleAuth() {
+        Assertions.assertEquals(4, multiCompositeProvider.getAuthenticationProviders().size());
+    }
+
     @Inject
-    @Authentication(openApiSpecId = "spec_1")
+    @OpenApiSpec(openApiSpecId = "spec_1")
     CompositeAuthenticationProvider spec1CompositeProvider;
 
-    @Authentication(openApiSpecId = "spec_2")
+    @Inject
+    @OpenApiSpec(openApiSpecId = "spec_2")
     CompositeAuthenticationProvider spec2CompositeProvider;
 
-    @Authentication(openApiSpecId = "spec_3")
+    @Inject
+    @OpenApiSpec(openApiSpecId = "spec_3")
     CompositeAuthenticationProvider spec3CompositeProvider;
 
-    @jakarta.annotation.Priority(jakarta.ws.rs.Priorities.AUTHENTICATION)
+    @Inject
+    @OpenApiSpec(openApiSpecId = "spec_multi")
+    CompositeAuthenticationProvider multiCompositeProvider;
+
+    @Priority(jakarta.ws.rs.Priorities.AUTHENTICATION)
     @OauthAuthenticationMarker(name = "oauth_auth", openApiSpecId = "spec_1")
     @BasicAuthenticationMarker(name = "basic_auth", openApiSpecId = "spec_2")
     @ApiKeyAuthenticationMarker(name = "api_key", openApiSpecId = "spec_3", apiKeyIn = header, apiKeyName = "api_key")
+
+    @OauthAuthenticationMarker(name = "oauth_auth1", openApiSpecId = "spec_multi")
+    @OauthAuthenticationMarker(name = "oauth_auth2", openApiSpecId = "spec_multi")
+    @BasicAuthenticationMarker(name = "basic_auth1", openApiSpecId = "spec_multi")
+    @BasicAuthenticationMarker(name = "basic_auth2", openApiSpecId = "spec_multi")
     public static class LocalAuthenticationProvider {
 
     }
 
-}
+}
diff --git a/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/authentication/OperationTest.java b/client/deployment/src/test/java/io/quarkiverse/openapi/generator/deployment/authentication/OperationTest.java
@@ -14,7 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import io.quarkiverse.openapi.generator.Authentication;
+import io.quarkiverse.openapi.generator.OpenApiSpec;
 import io.quarkiverse.openapi.generator.annotations.GeneratedClass;
 import io.quarkiverse.openapi.generator.markers.BasicAuthenticationMarker;
 import io.quarkiverse.openapi.generator.markers.OauthAuthenticationMarker;
@@ -48,10 +48,10 @@ public void test() {
     }
 
     @Inject
-    @Authentication(openApiSpecId = "petstore_json")
+    @OpenApiSpec(openApiSpecId = "petstore_json")
     CompositeAuthenticationProvider compositeProvider;
     @Inject
-    @Authentication(openApiSpecId = "other_spec_json")
+    @OpenApiSpec(openApiSpecId = "other_spec_json")
     CompositeAuthenticationProvider otherProvider;
 
     @RegisterRestClient(baseUri = "http://localhost/api/v3", configKey = "petstore_json")
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthName.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthName.java
@@ -0,0 +1,31 @@
+package io.quarkiverse.openapi.generator;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
+
+@Qualifier
+@Retention(RUNTIME)
+@Target({ METHOD, FIELD, PARAMETER, TYPE })
+public @interface AuthName {
+
+    String name();
+
+    final class Literal extends AnnotationLiteral<AuthName> implements AuthName {
+        public Literal(String name) {
+            this.name = name;
+        }
+
+        final String name;
+
+        @Override
+        public String name() {
+            return name;
+        }
+    }
+}
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthenticationRecorder.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/AuthenticationRecorder.java
@@ -7,7 +7,7 @@
 import jakarta.enterprise.inject.Instance;
 import jakarta.enterprise.util.TypeLiteral;
 
-import io.quarkiverse.openapi.generator.Authentication.Literal;
+import io.quarkiverse.openapi.generator.OpenApiSpec.Literal;
 import io.quarkiverse.openapi.generator.providers.*;
 import io.quarkiverse.openapi.generator.providers.OAuth2AuthenticationProvider.OidcClientRequestFilterDelegate;
 import io.quarkus.arc.SyntheticCreationalContext;
@@ -27,7 +27,6 @@ public Function<SyntheticCreationalContext<CompositeAuthenticationProvider>, Com
         return ctx -> {
             List<AuthProvider> providers = ctx.getInjectedReference(new TypeLiteral<Instance<AuthProvider>>() {
             }, new Literal(openApiSpec)).stream().toList();
-            System.out.println(providers.size());
             return new CompositeAuthenticationProvider(providers);
         };
     }
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/ClassicOidcClientRequestFilterDelegate.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/ClassicOidcClientRequestFilterDelegate.java
@@ -39,6 +39,7 @@ protected java.util.Optional<String> clientId() {
         return java.util.Optional.of(clientId);
     }
 
+    @Override
     public void filter(ClientRequestContext requestContext) throws IOException {
         try {
             String accessToken = this.getAccessToken();
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiSpec.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/OpenApiSpec.java
@@ -12,11 +12,11 @@
 @Qualifier
 @Retention(RUNTIME)
 @Target({ METHOD, FIELD, PARAMETER, TYPE })
-public @interface Authentication {
+public @interface OpenApiSpec {
 
     String openApiSpecId();
 
-    final class Literal extends AnnotationLiteral<Authentication> implements Authentication {
+    final class Literal extends AnnotationLiteral<OpenApiSpec> implements OpenApiSpec {
         public Literal(String openApiSpecId) {
             this.openApiSpecId = openApiSpecId;
         }
diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/ReactiveOidcClientRequestFilterDelegate.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/ReactiveOidcClientRequestFilterDelegate.java
@@ -41,6 +41,7 @@ protected java.util.Optional<String> clientId() {
         return java.util.Optional.of(clientId);
     }
 
+    @Override
     protected void initTokens() {
         if (earlyTokenAcquisition) {
             LOG.debug("Token acquisition will be delayed until this filter is executed to avoid blocking an IO thread");
diff --git a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/AbstractOpenApiSpecProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/AbstractOpenApiSpecProviderTest.java
@@ -21,7 +21,7 @@
 import io.quarkiverse.openapi.generator.SpecItemConfig;
 
 @ExtendWith(MockitoExtension.class)
-abstract class AbstractAuthenticationProviderTest<T extends AbstractAuthProvider> {
+abstract class AbstractOpenApiSpecProviderTest<T extends AbstractAuthProvider> {
 
     protected static final String OPEN_API_FILE_SPEC_ID = "open_api_file_spec_id_json";
     protected static final String AUTH_SCHEME_NAME = "auth_scheme_name";
diff --git a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyOpenApiSpecProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyOpenApiSpecProviderTest.java
@@ -23,7 +23,7 @@
 
 import io.quarkiverse.openapi.generator.AuthConfig;
 
-class ApiKeyAuthenticationProviderTest extends AbstractAuthenticationProviderTest<ApiKeyAuthenticationProvider> {
+class ApiKeyOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest<ApiKeyAuthenticationProvider> {
 
     private static final String API_KEY_NAME = "API_KEY_NAME";
     private static final String API_KEY_VALUE = "API_KEY_VALUE";
diff --git a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicOpenApiSpecProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicOpenApiSpecProviderTest.java
@@ -13,7 +13,7 @@
 
 import io.quarkiverse.openapi.generator.AuthConfig;
 
-class BasicAuthenticationProviderTest extends AbstractAuthenticationProviderTest<BasicAuthenticationProvider> {
+class BasicOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest<BasicAuthenticationProvider> {
 
     private static final String USER = "USER";
     private static final String PASSWORD = "PASSWORD";
diff --git a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BearerOpenApiSpecProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BearerOpenApiSpecProviderTest.java
@@ -16,7 +16,7 @@
 
 import io.quarkiverse.openapi.generator.AuthConfig;
 
-class BearerAuthenticationProviderTest extends AbstractAuthenticationProviderTest<BearerAuthenticationProvider> {
+class BearerOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest<BearerAuthenticationProvider> {
 
     private static final String TOKEN = "TOKEN";
     private static final String INCOMING_TOKEN = "INCOMING_TOKEN";

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package {apiPackage}.auth;`
`3`	`3`	`public class AuthenticationPropagationHeadersFactory extends io.quarkiverse.openapi.generator.providers.AbstractAuthenticationPropagationHeadersFactory {`
`4`	`4`
`5`	`5`	`@jakarta.inject.Inject`
`6`		`- public AuthenticationPropagationHeadersFactory(@io.quarkiverse.openapi.generator.Authentication(openApiSpecId="{configKey}") io.quarkiverse.openapi.generator.providers.CompositeAuthenticationProvider compositeProvider, io.quarkiverse.openapi.generator.OpenApiGeneratorConfig generatorConfig, io.quarkiverse.openapi.generator.providers.HeadersProvider headersProvider) {`
	`6`	`+ public AuthenticationPropagationHeadersFactory(@io.quarkiverse.openapi.generator.OpenApiSpec(openApiSpecId="{configKey}") io.quarkiverse.openapi.generator.providers.CompositeAuthenticationProvider compositeProvider, io.quarkiverse.openapi.generator.OpenApiGeneratorConfig generatorConfig, io.quarkiverse.openapi.generator.providers.HeadersProvider headersProvider) {`
`7`	`7`	`super(compositeProvider, generatorConfig, headersProvider);`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ protected java.util.Optional<String> clientId() {`
`39`	`39`	`return java.util.Optional.of(clientId);`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ @Override`
`42`	`43`	`public void filter(ClientRequestContext requestContext) throws IOException {`
`43`	`44`	`try {`
`44`	`45`	`String accessToken = this.getAccessToken();`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ protected java.util.Optional<String> clientId() {`
`41`	`41`	`return java.util.Optional.of(clientId);`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ @Override`
`44`	`45`	`protected void initTokens() {`
`45`	`46`	`if (earlyTokenAcquisition) {`
`46`	`47`	`LOG.debug("Token acquisition will be delayed until this filter is executed to avoid blocking an IO thread");`