avoid stereotype annotations on injection points in InjectionPointTest

jakartaee · May 18, 2023 · dc6a835 · dc6a835
1 parent 3e717ec
commit dc6a835
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 33 deletions.
diff --git a/...okup/injectionpoint/AnimalStereotype.java → ...k/tests/lookup/injectionpoint/Animal.java b/...okup/injectionpoint/AnimalStereotype.java → ...k/tests/lookup/injectionpoint/Animal.java
@@ -24,13 +24,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import jakarta.enterprise.context.RequestScoped;
-import jakarta.enterprise.inject.Stereotype;
-
-@Stereotype
 @Target({ TYPE, METHOD, FIELD })
 @Retention(RUNTIME)
-@RequestScoped
-public @interface AnimalStereotype {
-
+public @interface Animal {
 }
diff --git a/...java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java b/...java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
diff --git a/.../src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java b/.../src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java
@@ -29,7 +29,7 @@
 @RequestScoped
 public class FieldInjectionPointBean {
     @Inject
-    @AnimalStereotype
+    @Animal
     private BeanWithInjectionPointMetadata injectedBean;
 
     public BeanWithInjectionPointMetadata getInjectedBean() {

diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java
@@ -152,7 +152,7 @@ public void testGetAnnotatedField() {
         BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
         assert beanWithInjectionPoint.getInjectedMetadata() != null;
         assert beanWithInjectionPoint.getInjectedMetadata().getAnnotated() instanceof AnnotatedField<?>;
-        assert beanWithInjectionPoint.getInjectedMetadata().getAnnotated().isAnnotationPresent(AnimalStereotype.class);
+        assert beanWithInjectionPoint.getInjectedMetadata().getAnnotated().isAnnotationPresent(Animal.class);
     }
 
     @Test

diff --git a/.../java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java b/.../java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java
@@ -29,7 +29,6 @@
 @RequestScoped
 public class TransientFieldInjectionPointBean {
     @Inject
-    @AnimalStereotype
     private transient BeanWithInjectionPointMetadata injectedBean;
 
     public BeanWithInjectionPointMetadata getInjectedBean() {