Add tests for InvocationContext.getInterceptorBindings()

jakartaee · Jul 17, 2023 · c34f1fb · c34f1fb
1 parent 899d79e
commit c34f1fb
Show file tree

Hide file tree

Showing 14 changed files with 287 additions and 1 deletion.
diff --git a/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding11.java b/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding11.java
@@ -0,0 +1,21 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.interceptor.InterceptorBinding;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@InterceptorBinding
+@Inherited
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+public @interface Binding11 {
+    class Literal extends AnnotationLiteral<Binding11> implements Binding11 {
+    }
+}
diff --git a/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding12.java b/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding12.java
@@ -0,0 +1,21 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.interceptor.InterceptorBinding;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@InterceptorBinding
+@Inherited
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+public @interface Binding12 {
+    class Literal extends AnnotationLiteral<Binding12> implements Binding12 {
+    }
+}
diff --git a/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding13.java b/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding13.java
@@ -0,0 +1,33 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.interceptor.InterceptorBinding;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@InterceptorBinding
+@Inherited
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+public @interface Binding13 {
+    String value();
+
+    class Literal extends AnnotationLiteral<Binding13> implements Binding13 {
+        private final String value;
+
+        public Literal(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String value() {
+            return value;
+        }
+    }
+}
diff --git a/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding14.java b/.../main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding14.java
@@ -0,0 +1,35 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.interceptor.InterceptorBinding;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@InterceptorBinding
+@Inherited
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+public @interface Binding14 {
+    @Nonbinding
+    String value();
+
+    class Literal extends AnnotationLiteral<Binding14> implements Binding14 {
+        private final String value;
+
+        public Literal(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String value() {
+            return value;
+        }
+    }
+}
diff --git a/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor11.java b/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor11.java
@@ -0,0 +1,16 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
+
+@Interceptor
+@Binding11
+@Priority(1100)
+public class Interceptor11 {
+    @AroundInvoke
+    public Object intercept(InvocationContext ctx) throws Exception {
+        return ctx.proceed();
+    }
+}
diff --git a/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor12.java b/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor12.java
@@ -0,0 +1,52 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+@Interceptor
+@Binding12
+@Priority(1200)
+public class Interceptor12 {
+    private static Set<Annotation> allBindings;
+
+    private static Set<Binding12> binding12s; // must be non-empty
+    private static Binding12 binding12; // must be non-null
+
+    private static Set<Binding5> binding5s; // must be empty
+    private static Binding6 binding6; // must be null
+
+    @AroundInvoke
+    public Object intercept(InvocationContext ctx) throws Exception {
+        allBindings = ctx.getInterceptorBindings();
+        binding12s = ctx.getInterceptorBindings(Binding12.class);
+        binding12 = ctx.getInterceptorBinding(Binding12.class);
+        binding5s = ctx.getInterceptorBindings(Binding5.class);
+        binding6 = ctx.getInterceptorBinding(Binding6.class);
+        return ctx.proceed();
+    }
+
+    public static Set<Annotation> getAllBindings() {
+        return allBindings;
+    }
+
+    public static Set<Binding12> getBinding12s() {
+        return binding12s;
+    }
+
+    public static Binding12 getBinding12() {
+        return binding12;
+    }
+
+    public static Set<Binding5> getBinding5s() {
+        return binding5s;
+    }
+
+    public static Binding6 getBinding6() {
+        return binding6;
+    }
+}
diff --git a/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor13.java b/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor13.java
@@ -0,0 +1,16 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
+
+@Interceptor
+@Binding13("ok")
+@Priority(1300)
+public class Interceptor13 {
+    @AroundInvoke
+    public Object intercept(InvocationContext ctx) throws Exception {
+        return ctx.proceed();
+    }
+}
diff --git a/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor14.java b/...n/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor14.java
@@ -0,0 +1,16 @@
+package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext;
+
+import jakarta.annotation.Priority;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
+
+@Interceptor
+@Binding14("")
+@Priority(1400)
+public class Interceptor14 {
+    @AroundInvoke
+    public Object intercept(InvocationContext ctx) throws Exception {
+        return ctx.proceed();
+    }
+}
diff --git a/...rg/jboss/cdi/tck/interceptors/tests/contract/invocationContext/InvocationContextTest.java b/...rg/jboss/cdi/tck/interceptors/tests/contract/invocationContext/InvocationContextTest.java
@@ -20,6 +20,7 @@
 import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INVOCATIONCONTEXT;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
@@ -31,6 +32,8 @@
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.testng.annotations.Test;
 
+import java.util.Set;
+
 /**
  * Tests for the InvocationContext implementation
  *
@@ -122,4 +125,17 @@ public void testBusinessMethodNotCalledWithoutProceedInvocation() {
         assertEquals(getContextualReference(SimpleBean.class).echo("foo"), "foo");
         assertFalse(SimpleBean.isEchoCalled());
     }
+
+    @Test
+    @SpecAssertion(section = INVOCATIONCONTEXT, id = "n")
+    @SpecAssertion(section = INVOCATIONCONTEXT, id = "o")
+    public void testGetInterceptorBindings() {
+        assertTrue(getContextualReference(SimpleBean.class).bindings());
+        assertEquals(Interceptor12.getAllBindings(), Set.of(new SimplePCBinding.Literal(), new Binding11.Literal(),
+                new Binding12.Literal(), new Binding13.Literal("ko"), new Binding14.Literal("foobar")));
+        assertEquals(Interceptor12.getBinding12s(), Set.of(new Binding12.Literal()));
+        assertEquals(Interceptor12.getBinding12(), new Binding12.Literal());
+        assertEquals(Interceptor12.getBinding5s(), Set.of());
+        assertNull(Interceptor12.getBinding6());
+    }
 }
diff --git a/...main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBean.java b/...main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBean.java
@@ -72,6 +72,14 @@ public String echo(String s) {
         return s;
     }
 
+    @Binding11
+    @Binding12
+    @Binding13("ko") // does not associate `Interceptor13` with this bean due to different annotation member
+    @Binding14("foobar")
+    public boolean bindings() {
+        return true;
+    }
+
     public static boolean isEchoCalled() {
         return echoCalled;
     }

diff --git a/...java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimplePCBinding.java b/...java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimplePCBinding.java
@@ -4,6 +4,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import jakarta.enterprise.util.AnnotationLiteral;
 import jakarta.interceptor.InterceptorBinding;
 
 import static java.lang.annotation.ElementType.METHOD;
@@ -15,4 +16,6 @@
 @Target({ TYPE })
 @Retention(RUNTIME)
 public @interface SimplePCBinding {
+    class Literal extends AnnotationLiteral<SimplePCBinding> implements SimplePCBinding {
+    }
 }
diff --git a/impl/src/main/resources/tck-audit-int.xml b/impl/src/main/resources/tck-audit-int.xml
@@ -332,6 +332,19 @@
             <note>Unclear meaning of validation.</note>
         </assertion>
 
+        <assertion id="n">
+            <text>
+                The |getInterceptorBindings| method returns the set of interceptor binding annotations
+                that were used to associate interceptors with the target instance that is being intercepted.
+            </text>
+        </assertion>
+
+        <assertion id="o">
+            <text>
+                The |getInterceptorBinding| method returns the single interceptor binding annotation of given type
+                that was used to associate interceptors with the target instance that is being intercepted.
+            </text>
+        </assertion>
     </section>
 
     <section id="exceptions" title="Exceptions" level="2">

diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,7 @@
         <maven.compiler.release>11</maven.compiler.release>
         <!-- Jakarta EE APIs Core -->
         <annotations.api.version>2.1.0</annotations.api.version>
-        <interceptors.api.version>2.1.0</interceptors.api.version>
+        <interceptors.api.version>2.2.0-RC1</interceptors.api.version>
         <atinject.api.version>2.0.1</atinject.api.version>
         <el.api.version>5.0.0</el.api.version>
 
@@ -361,6 +361,29 @@
             </build>
         </profile>
 
+        <!-- TODO remove once Jakarta Interceptors 2.2.0-RC1 reaches Central -->
+        <profile>
+            <id>jakarta-ossrh-staging</id>
+            <activation>
+                <property>
+                    <name>jakarta-ossrh-staging</name>
+                    <value>!false</value>
+                </property>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>jakarta-ossrh-staging</id>
+                    <url>https://jakarta.oss.sonatype.org/content/groups/staging</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+        </profile>
+
         <profile>
             <id>jboss-public-repository</id>
             <activation>

diff --git a/web/src/main/resources/tck-audit-int.xml b/web/src/main/resources/tck-audit-int.xml
@@ -332,6 +332,19 @@
             <note>Unclear meaning of validation.</note>
         </assertion>
 
+        <assertion id="n">
+            <text>
+                The |getInterceptorBindings| method returns the set of interceptor binding annotations
+                that were used to associate interceptors with the target instance that is being intercepted.
+            </text>
+        </assertion>
+
+        <assertion id="o">
+            <text>
+                The |getInterceptorBinding| method returns the single interceptor binding annotation of given type
+                that was used to associate interceptors with the target instance that is being intercepted.
+            </text>
+        </assertion>
     </section>
 
     <section id="exceptions" title="Exceptions" level="2">