Merge pull request quarkusio#4003 from mkouba/issue-4002-autoinject-f…

…ield-bug Do not auto-@Inject producer fields
Dufgui · Sep 13, 2019 · 8456e60 · 8456e60
2 parents 50a19fa + 6210676
commit 8456e60
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/...ions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java b/...ions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java
@@ -58,7 +58,8 @@ public boolean appliesTo(AnnotationTarget.Kind kind) {
             @Override
             public void transform(TransformationContext transformationContext) {
                 FieldInfo field = transformationContext.getTarget().asField();
-                if (Modifier.isStatic(field.flags()) || field.hasAnnotation(DotNames.INJECT)) {
+                if (Modifier.isStatic(field.flags()) || field.hasAnnotation(DotNames.INJECT)
+                        || field.hasAnnotation(DotNames.PRODUCES)) {
                     return;
                 }
                 for (DotName annotation : annotations) {

diff --git a/...s/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java b/...s/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java
@@ -36,6 +36,7 @@ public class AutoFieldInjectionTest {
     @Test
     public void testConfigWasInjected() {
         Assertions.assertEquals("ok", bean.foo);
+        Assertions.assertEquals(1l, bean.bar);
     }
 
     @Dependent
@@ -45,10 +46,18 @@ static class Client {
         @MyQualifier
         String foo;
 
+        @MyQualifier
+        Long bar;
+
     }
 
     static class Producer {
 
+        // @Inject should not be added here
+        @MyQualifier
+        @Produces
+        Long producedLong = 1l;
+
         @MyQualifier
         @Produces
         String produceString() {

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
@@ -662,6 +662,9 @@ private List<BeanInfo> findBeans(Collection<DotName> beanDefiningAnnotations, Li
             }
             for (FieldInfo field : beanClass.fields()) {
                 if (annotationStore.hasAnnotation(field, DotNames.PRODUCES)) {
+                    if (annotationStore.hasAnnotation(field, DotNames.INJECT)) {
+                        throw new DefinitionException("Injected field cannot be annotated with @Produces: " + field);
+                    }
                     // Producer fields are not inherited
                     producerFields.add(field);
                     if (!hasBeanDefiningAnnotation) {

diff --git a/...tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java b/...tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldWithInjectTest.java
@@ -0,0 +1,36 @@
+package io.quarkus.arc.test.producer.illegal;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import io.quarkus.arc.test.ArcTestContainer;
+import java.time.temporal.Temporal;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.DefinitionException;
+import javax.inject.Inject;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class ProducerFieldWithInjectTest {
+
+    @Rule
+    public ArcTestContainer container = ArcTestContainer.builder().beanClasses(IllegalProducer.class).shouldFail().build();
+
+    @Test
+    public void testFailure() {
+        Throwable error = container.getFailure();
+        assertNotNull(error);
+        assertTrue(error instanceof DefinitionException);
+    }
+
+    @Dependent
+    static class IllegalProducer {
+
+        @Inject
+        @Produces
+        Temporal temporal;
+
+    }
+
+}