diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Animal.java similarity index 88% rename from impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotype.java rename to impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Animal.java index 44d0ec62ee..bb504266a6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/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/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java deleted file mode 100644 index e959af6ab6..0000000000 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.injectionpoint; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral implements AnimalStereotype { - -} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java index d9a1500cd0..7605a90f2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java +++ b/impl/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 index f94022c058..ce836ceb86 100644 --- 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/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java index 33eb94c01f..1fdcc873ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java +++ b/impl/src/main/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() {