Merge pull request quarkusio#17972 from mkouba/issue-17583

ArC - rework the way the build profile producer beans are disabled
gsmet · Jun 17, 2021 · 05b3caa · 05b3caa
2 parents 8269fbd + 1b5a102
commit 05b3caa
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/...ons/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java b/...ons/arc/deployment/src/main/java/io/quarkus/arc/deployment/BuildTimeEnabledProcessor.java
@@ -269,9 +269,8 @@ private void transformBean(AnnotationTarget target, TransformationContext ctx, b
                 // Veto the class
                 transform.add(DotNames.VETOED);
             } else {
-                // Add @Alternative to the producer
-                transform.add(DotNames.ALTERNATIVE);
-                transform.remove(s -> s.name().equals(DotNames.ALTERNATIVE_PRIORITY));
+                // Veto the producer
+                transform.add(DotNames.VETOED_PRODUCER);
             }
             transform.done();
         }

diff --git a/...pendent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java b/...pendent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanDeployment.java
@@ -804,7 +804,8 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
                 if (annotationStore.getAnnotations(method).isEmpty()) {
                     continue;
                 }
-                if (annotationStore.hasAnnotation(method, DotNames.PRODUCES)) {
+                if (annotationStore.hasAnnotation(method, DotNames.PRODUCES)
+                        && !annotationStore.hasAnnotation(method, DotNames.VETOED_PRODUCER)) {
                     // Producers are not inherited
                     producerMethods.add(method);
                     if (!hasBeanDefiningAnnotation) {
@@ -874,7 +875,8 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
                         : null;
             }
             for (FieldInfo field : beanClass.fields()) {
-                if (annotationStore.hasAnnotation(field, DotNames.PRODUCES)) {
+                if (annotationStore.hasAnnotation(field, DotNames.PRODUCES)
+                        && !annotationStore.hasAnnotation(field, DotNames.VETOED_PRODUCER)) {
                     if (annotationStore.hasAnnotation(field, DotNames.INJECT)) {
                         throw new DefinitionException("Injected field cannot be annotated with @Produces: " + field);
                     }

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DotNames.java
@@ -6,6 +6,7 @@
 import io.quarkus.arc.InjectableBean;
 import io.quarkus.arc.InjectableInstance;
 import io.quarkus.arc.Unremovable;
+import io.quarkus.arc.VetoedProducer;
 import io.quarkus.arc.impl.ComputingCache;
 import java.io.Serializable;
 import java.lang.annotation.Repeatable;
@@ -113,6 +114,7 @@ public final class DotNames {
     public static final DotName DELEGATE = create(Delegate.class);
     public static final DotName SERIALIZABLE = create(Serializable.class);
     public static final DotName UNREMOVABLE = create(Unremovable.class);
+    public static final DotName VETOED_PRODUCER = create(VetoedProducer.class);
 
     public static final DotName BOOLEAN = create(Boolean.class);
     public static final DotName BYTE = create(Byte.class);

diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/VetoedProducer.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/VetoedProducer.java
@@ -0,0 +1,14 @@
+package io.quarkus.arc;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Denotes a producer method or field that should be vetoed, i.e. ignored during bean discovery.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.METHOD })
+public @interface VetoedProducer {
+}