Arc - consider @decorator to be bean defining annotation. Add automated test.

Author: manovotn

build-parent/pom.xml

@@ -277,6 +277,11 @@
                 <artifactId>quarkus-arc-test-supplement</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-arc-test-supplement-decorator</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>

extensions/arc/deployment/pom.xml

@@ -49,6 +49,11 @@
             <artifactId>quarkus-arc-test-supplement</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-arc-test-supplement-decorator</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- Used to test wrong @Singleton detection -->
         <dependency>
             <groupId>jakarta.ejb</groupId>

extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/BeanArchiveProcessor.java

@@ -149,11 +149,14 @@ private IndexView buildApplicationIndex(ArcConfig config, ApplicationArchivesBui
                         .map(bda -> new BeanDefiningAnnotation(bda.getName(), bda.getDefaultScope()))
                         .collect(Collectors.toList()), stereotypes);
         beanDefiningAnnotations.addAll(customScopes.getCustomScopeNames());
-        // Also include archives that are not bean archives but contain scopes, qualifiers or interceptor bindings
+        // Also include archives that are not bean archives but contain scopes, qualifiers,
+        // interceptor bindings, interceptors or decorators
         beanDefiningAnnotations.add(DotNames.SCOPE);
         beanDefiningAnnotations.add(DotNames.NORMAL_SCOPE);
         beanDefiningAnnotations.add(DotNames.QUALIFIER);
         beanDefiningAnnotations.add(DotNames.INTERCEPTOR_BINDING);
+        beanDefiningAnnotations.add(DotNames.DECORATOR);
+        beanDefiningAnnotations.add(DotNames.INTERCEPTOR);
 
         boolean rootIsAlwaysBeanArchive = !config.strictCompatibility();
         Collection<ApplicationArchive> candidateArchives = applicationArchivesBuildItem.getApplicationArchives();

extensions/arc/deployment/src/test/java/io/quarkus/arc/test/decorator/DecoratorAsBeanDefiningAnnotationTest.java

@@ -0,0 +1,46 @@
+package io.quarkus.arc.test.decorator;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.test.supplement.decorator.SomeInterface;
+import io.quarkus.builder.Version;
+import io.quarkus.maven.dependency.Dependency;
+import io.quarkus.test.QuarkusUnitTest;
+
+public class DecoratorAsBeanDefiningAnnotationTest {
+
+    // The test has a CDI bean in the application and a decorator in a second archive that has no other CDI items.
+    // The idea is to test that @Decorator is a bean defining annotation and will be picked up.
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .withApplicationRoot(jar -> jar.addClass(SomeBean.class))
+            // we need a non-application archive, so cannot use `withAdditionalDependency()`
+            .setForcedDependencies(
+                    List.of(Dependency.of("io.quarkus", "quarkus-arc-test-supplement-decorator", Version.getVersion())));
+
+    @Inject
+    SomeBean bean;
+
+    @Test
+    public void test() {
+        assertEquals("Delegated: SomeBean", bean.ping());
+    }
+
+    @Dependent
+    public static class SomeBean implements SomeInterface {
+
+        @Override
+        public String ping() {
+            return SomeBean.class.getSimpleName();
+        }
+    }
+}

extensions/arc/pom.xml

@@ -17,6 +17,7 @@
         <module>deployment</module>
         <module>runtime</module>
         <module>test-supplement</module>
+        <module>test-supplement-decorator</module>
     </modules>
 
 </project>

extensions/arc/test-supplement-decorator/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-arc-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-arc-test-supplement-decorator</artifactId>
+    <name>Quarkus - ArC - Test Supplement Decorator</name>
+    <description>Supplement archive for ArC tests</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.smallrye</groupId>
+                <artifactId>jandex-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-index</id>
+                        <goals>
+                            <goal>jandex</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

extensions/arc/test-supplement-decorator/src/main/java/io/quarkus/arc/test/supplement/decorator/SomeDecorator.java

@@ -0,0 +1,21 @@
+package io.quarkus.arc.test.supplement.decorator;
+
+import jakarta.annotation.Priority;
+import jakarta.decorator.Decorator;
+import jakarta.decorator.Delegate;
+import jakarta.inject.Inject;
+
+@Decorator
+@Priority(10)
+public class SomeDecorator implements SomeInterface {
+
+    @Inject
+    @Delegate
+    SomeInterface delegate;
+
+    @Override
+    public String ping() {
+        return "Delegated: " + delegate.ping();
+    }
+
+}

extensions/arc/test-supplement-decorator/src/main/java/io/quarkus/arc/test/supplement/decorator/SomeInterface.java

@@ -0,0 +1,7 @@
+package io.quarkus.arc.test.supplement.decorator;
+
+public interface SomeInterface {
+
+    String ping();
+
+}