From 4c25b68e63f9966fdc12c8000d7273c49c5d4744 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Wed, 22 Feb 2023 17:09:38 +0100
Subject: [PATCH 1/2] Arc - Validate whether interceptors declare producer
 methods

---
 .../arc/processor/InterceptorInfo.java        | 16 ++++
 .../illegal/DisposerInInterceptorTest.java    | 73 ++++++++++++++++++
 .../ProducerFieldInInterceptorTest.java       | 73 ++++++++++++++++++
 .../ProducerMethodInInterceptorTest.java      | 76 +++++++++++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/illegal/DisposerInInterceptorTest.java
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldInInterceptorTest.java
 create mode 100644 independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerMethodInInterceptorTest.java

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
index 2438fe6045ac9..444f04ec4807a 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
@@ -9,12 +9,14 @@
 import java.util.List;
 import java.util.Set;
 
+import jakarta.enterprise.inject.spi.DefinitionException;
 import jakarta.enterprise.inject.spi.InterceptionType;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.MethodInfo;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.Type.Kind;
@@ -57,6 +59,12 @@ public class InterceptorInfo extends BeanInfo implements Comparable<InterceptorI
                 if (Modifier.isStatic(method.flags())) {
                     continue;
                 }
+                if (method.hasAnnotation(DotNames.PRODUCES) || method.hasAnnotation(DotNames.DISPOSES)) {
+                    // according to spec, finding @Produces or @Disposes on a method is a DefinitionException
+                    throw new DefinitionException(
+                            "An interceptor method cannot be marked @Produces or @Disposes - " + method + " in class: "
+                                    + aClass);
+                }
                 if (method.hasAnnotation(DotNames.AROUND_INVOKE)) {
                     aroundInvokes.add(validateSignature(method));
                 }
@@ -71,6 +79,14 @@ public class InterceptorInfo extends BeanInfo implements Comparable<InterceptorI
                 }
             }
 
+            for (FieldInfo field : aClass.fields()) {
+                if (field.hasAnnotation(DotNames.PRODUCES)) {
+                    // according to spec, finding @Produces on a field is a DefinitionException
+                    throw new DefinitionException(
+                            "An interceptor field cannot be marked @Produces - " + field + " in class: " + aClass);
+                }
+            }
+
             DotName superTypeName = aClass.superName();
             aClass = superTypeName == null || DotNames.OBJECT.equals(superTypeName) ? null
                     : getClassByName(beanDeployment.getBeanArchiveIndex(), superTypeName);
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/illegal/DisposerInInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/illegal/DisposerInInterceptorTest.java
new file mode 100644
index 0000000000000..a6e5685f7f178
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/disposer/illegal/DisposerInInterceptorTest.java
@@ -0,0 +1,73 @@
+package io.quarkus.arc.test.producer.disposer.illegal;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.spi.DefinitionException;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InterceptorBinding;
+import jakarta.interceptor.InvocationContext;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.test.ArcTestContainer;
+
+public class DisposerInInterceptorTest {
+    @RegisterExtension
+    public ArcTestContainer container = ArcTestContainer.builder()
+            .beanClasses(BadInterceptor.class, FooBean.class, MyBinding.class).shouldFail()
+            .build();
+
+    @Test
+    public void testFailure() {
+        Throwable error = container.getFailure();
+        assertNotNull(error);
+        assertTrue(error instanceof DefinitionException);
+    }
+
+    @Interceptor
+    @MyBinding
+    @Priority(1)
+    static class BadInterceptor {
+
+        @AroundInvoke
+        public Object aroundInvoke(InvocationContext ic) throws Exception {
+            return ic.proceed();
+        }
+
+        // declaring a disposer inside an interceptor should raise DefinitionException
+        void dispose(@Disposes String ignored) {
+        }
+
+    }
+
+    @Dependent
+    @MyBinding
+    static class FooBean {
+
+        public String ping() {
+            return FooBean.class.getSimpleName();
+        }
+
+    }
+
+    @Target({ TYPE, METHOD })
+    @Retention(RUNTIME)
+    @Documented
+    @InterceptorBinding
+    @interface MyBinding {
+
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldInInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldInInterceptorTest.java
new file mode 100644
index 0000000000000..fde1de66a7dc7
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerFieldInInterceptorTest.java
@@ -0,0 +1,73 @@
+package io.quarkus.arc.test.producer.illegal;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.DefinitionException;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InterceptorBinding;
+import jakarta.interceptor.InvocationContext;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.test.ArcTestContainer;
+
+public class ProducerFieldInInterceptorTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = ArcTestContainer.builder()
+            .beanClasses(BadInterceptor.class, FooBean.class, MyBinding.class).shouldFail()
+            .build();
+
+    @Test
+    public void testFailure() {
+        Throwable error = container.getFailure();
+        assertNotNull(error);
+        assertTrue(error instanceof DefinitionException);
+    }
+
+    @Interceptor
+    @MyBinding
+    @Priority(1)
+    static class BadInterceptor {
+
+        @AroundInvoke
+        public Object aroundInvoke(InvocationContext ic) throws Exception {
+            return ic.proceed();
+        }
+
+        // declaring a producer inside an interceptor should raise DefinitionException
+        @Produces
+        String val = "42";
+    }
+
+    @Dependent
+    @MyBinding
+    static class FooBean {
+
+        public String ping() {
+            return ProducerMethodInInterceptorTest.FooBean.class.getSimpleName();
+        }
+
+    }
+
+    @Target({ TYPE, METHOD })
+    @Retention(RUNTIME)
+    @Documented
+    @InterceptorBinding
+    @interface MyBinding {
+
+    }
+}
diff --git a/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerMethodInInterceptorTest.java b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerMethodInInterceptorTest.java
new file mode 100644
index 0000000000000..b873836232ee6
--- /dev/null
+++ b/independent-projects/arc/tests/src/test/java/io/quarkus/arc/test/producer/illegal/ProducerMethodInInterceptorTest.java
@@ -0,0 +1,76 @@
+package io.quarkus.arc.test.producer.illegal;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.DefinitionException;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InterceptorBinding;
+import jakarta.interceptor.InvocationContext;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.arc.test.ArcTestContainer;
+
+public class ProducerMethodInInterceptorTest {
+
+    @RegisterExtension
+    public ArcTestContainer container = ArcTestContainer.builder()
+            .beanClasses(BadInterceptor.class, FooBean.class, MyBinding.class).shouldFail()
+            .build();
+
+    @Test
+    public void testFailure() {
+        Throwable error = container.getFailure();
+        assertNotNull(error);
+        assertTrue(error instanceof DefinitionException);
+    }
+
+    @Interceptor
+    @MyBinding
+    @Priority(1)
+    static class BadInterceptor {
+
+        @AroundInvoke
+        public Object aroundInvoke(InvocationContext ic) throws Exception {
+            return ic.proceed();
+        }
+
+        // declaring a producer inside an interceptor should raise DefinitionException
+        @Produces
+        String generateString() {
+            return "42";
+        }
+
+    }
+
+    @Dependent
+    @MyBinding
+    static class FooBean {
+
+        public String ping() {
+            return FooBean.class.getSimpleName();
+        }
+
+    }
+
+    @Target({ TYPE, METHOD })
+    @Retention(RUNTIME)
+    @Documented
+    @InterceptorBinding
+    @interface MyBinding {
+
+    }
+}

From 174b2c6797ff123b392753c182b900e5526e6089 Mon Sep 17 00:00:00 2001
From: Matej Novotny <manovotn@redhat.com>
Date: Thu, 23 Feb 2023 11:17:25 +0100
Subject: [PATCH 2/2] Arc - Change InterceptorInfo to use AnnotationStore
 instead of querying Jandex directly

---
 .../io/quarkus/arc/processor/AnnotationStore.java   |  2 +-
 .../io/quarkus/arc/processor/InterceptorInfo.java   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java
index 67e4fc4c78e37..dc3557562f721 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AnnotationStore.java
@@ -114,7 +114,7 @@ private Collection<AnnotationInstance> getOriginalAnnotations(AnnotationTarget t
         Collection<AnnotationInstance> annotations;
         switch (target.kind()) {
             case CLASS:
-                annotations = target.asClass().classAnnotations();
+                annotations = target.asClass().declaredAnnotations();
                 break;
             case METHOD:
                 // Note that the returning collection also contains method params annotations
diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
index 444f04ec4807a..79b90f70aa15a 100644
--- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
+++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/InterceptorInfo.java
@@ -48,6 +48,7 @@ public class InterceptorInfo extends BeanInfo implements Comparable<InterceptorI
                 Sets.singletonHashSet(Type.create(target.asClass().name(), Kind.CLASS)), new HashSet<>(), injections,
                 null, null, false, Collections.emptyList(), null, false, null, priority);
         this.bindings = bindings;
+        AnnotationStore store = beanDeployment.getAnnotationStore();
         List<MethodInfo> aroundInvokes = new ArrayList<>();
         List<MethodInfo> aroundConstructs = new ArrayList<>();
         List<MethodInfo> postConstructs = new ArrayList<>();
@@ -59,28 +60,28 @@ public class InterceptorInfo extends BeanInfo implements Comparable<InterceptorI
                 if (Modifier.isStatic(method.flags())) {
                     continue;
                 }
-                if (method.hasAnnotation(DotNames.PRODUCES) || method.hasAnnotation(DotNames.DISPOSES)) {
+                if (store.hasAnnotation(method, DotNames.PRODUCES) || store.hasAnnotation(method, DotNames.DISPOSES)) {
                     // according to spec, finding @Produces or @Disposes on a method is a DefinitionException
                     throw new DefinitionException(
                             "An interceptor method cannot be marked @Produces or @Disposes - " + method + " in class: "
                                     + aClass);
                 }
-                if (method.hasAnnotation(DotNames.AROUND_INVOKE)) {
+                if (store.hasAnnotation(method, DotNames.AROUND_INVOKE)) {
                     aroundInvokes.add(validateSignature(method));
                 }
-                if (method.hasAnnotation(DotNames.AROUND_CONSTRUCT)) {
+                if (store.hasAnnotation(method, DotNames.AROUND_CONSTRUCT)) {
                     aroundConstructs.add(validateSignature(method));
                 }
-                if (method.hasAnnotation(DotNames.POST_CONSTRUCT)) {
+                if (store.hasAnnotation(method, DotNames.POST_CONSTRUCT)) {
                     postConstructs.add(validateSignature(method));
                 }
-                if (method.hasAnnotation(DotNames.PRE_DESTROY)) {
+                if (store.hasAnnotation(method, DotNames.PRE_DESTROY)) {
                     preDestroys.add(validateSignature(method));
                 }
             }
 
             for (FieldInfo field : aClass.fields()) {
-                if (field.hasAnnotation(DotNames.PRODUCES)) {
+                if (store.hasAnnotation(field, DotNames.PRODUCES)) {
                     // according to spec, finding @Produces on a field is a DefinitionException
                     throw new DefinitionException(
                             "An interceptor field cannot be marked @Produces - " + field + " in class: " + aClass);