From dcdbe5a1af37d73ddd70effe35138a5bb7d1dc06 Mon Sep 17 00:00:00 2001 From: Ladislav Thon Date: Tue, 7 Mar 2023 15:02:27 +0100 Subject: [PATCH] Fix invalid annotation literals The `Annotation.equals()` contract directly states that for two annotation objects to be equal, they must (among others) both implement the [same] annotation interface. The CDI TCK used to create instances of memberless annotations simply by instantiating an anonymous subclass of `AnnotationLiteral`, which doesn't implement the annotation interface and hence is invalid. It has never been a problem, because `AnnotationLiteral` implements equality in a slightly more permissive manner: instead of checking that both objects implement the same annotation interface, it checks that both objects are annotations that have an equal `annotationType()`. It becomes problematic when an implementation uses a different mechanism to instantiate annotations than extending `AnnotationLiteral`, one that closely follows the `Annotation` contract. This commit replaces all usages of such anonymous subclasses by proper `AnnotationLiteral` subclasses that implement the annotation interface as well. --- .../resolution/ConstructorBinding.java | 3 ++ .../bindings/resolution/CreativeBinding.java | 3 ++ .../InterceptorBindingResolutionTest.java | 39 +++++++++---------- .../bindings/resolution/LoggedBinding.java | 3 ++ .../bindings/resolution/MachineBinding.java | 3 ++ .../bindings/resolution/MessageBinding.java | 3 ++ .../bindings/resolution/PingBinding.java | 3 ++ .../bindings/resolution/PongBinding.java | 3 ++ .../resolution/TransactionalBinding.java | 3 ++ .../cdi/tck/literals/InheritedLiteral.java | 9 +++++ .../cdi/tck/literals/OverrideLiteral.java | 7 ++++ .../cdi/tck/literals/StereotypeLiteral.java | 8 ++++ .../dependent/DependentContextTest.java | 6 +-- .../cdi/tck/tests/context/dependent/Pet.java | 4 +- .../cdi/tck/tests/context/dependent/Tame.java | 4 +- .../stereotype/StereotypeDefinitionTest.java | 3 +- .../tck/tests/definition/stereotype/Tame.java | 4 +- .../bindingTypes/EventBindingTypesTest.java | 4 +- .../event/bindingTypes/NonBindingType.java | 4 ++ .../bindingTypes/NonRuntimeBindingType.java | 3 ++ .../event/eventTypes/EventTypesTest.java | 3 +- .../cdi/tck/tests/event/eventTypes/Extra.java | 3 ++ .../cdi/tck/tests/event/fires/MiniBar.java | 3 +- .../cdi/tck/tests/event/fires/Restored.java | 3 ++ .../tests/event/observer/method/Number.java | 4 +- .../observer/method/ObserverMethodTest.java | 3 +- .../resolve/ResolveEventObserversTest.java | 11 ++---- .../tests/event/observer/resolve/Secret.java | 3 ++ .../tests/event/select/NotABindingType.java | 4 ++ .../tests/event/select/SelectEventTest.java | 9 ++--- .../cdi/tck/tests/event/select/Violent.java | 3 ++ .../AlternativeAvailabilityTest.java | 6 +-- .../cdi/tck/tests/full/alternative/Tame.java | 4 +- .../cdi/tck/tests/full/alternative/Wild.java | 4 +- .../definition/DecoratorDefinitionTest.java | 9 ++--- .../full/decorators/definition/Meta.java | 4 +- .../full/decorators/definition/NonMeta.java | 5 ++- .../metadata/AlternativeMetadataTest.java | 6 +-- .../alternative/metadata/Cheap.java | 4 +- .../alternative/metadata/Expensive.java | 4 +- .../metadata/GroceryInterceptorBinding.java | 4 +- .../alternative/metadata/GroceryWrapper.java | 16 ++++---- .../alternative/metadata/NamedStereotype.java | 4 +- ...etadataInterceptorInjectionTargetTest.java | 6 +-- .../interceptor/InterceptorExtension.java | 6 +-- .../interceptor/LoginInterceptorBinding.java | 4 +- .../metadata/interceptor/Secured.java | 4 +- .../beanManager/BeanManagerTest.java | 8 ++-- .../unavailable/methods/Transactional.java | 4 +- .../unavailable/methods/WrongExtension.java | 6 +-- .../full/extensions/communication/Baz.java | 4 +- .../communication/ExtensionBeta.java | 2 +- .../lifecycle/atd/AfterTypeDiscoveryTest.java | 6 +-- .../bbd/BeforeBeanDiscoveryObserver.java | 3 +- .../bbd/BeforeBeanDiscoveryTest.java | 9 ++--- .../full/extensions/lifecycle/bbd/Tame.java | 5 ++- .../tests/full/extensions/producer/Noisy.java | 4 +- .../extensions/producer/ProducerTest.java | 18 +++------ .../tests/full/extensions/producer/Quiet.java | 4 +- .../ProducerMethodDefinitionTest.java | 6 +-- .../producer/method/definition/Yummy.java | 4 +- .../producer/method/lifecycle/Pet.java | 4 +- .../ProducerMethodLifecycleTest.java | 3 +- .../lifecycle/SimpleBeanLifecycleTest.java | 3 +- .../implementation/simple/lifecycle/Tame.java | 4 +- .../producer/method/Expensive.java | 4 +- .../ProducerMethodSpecializationTest.java | 6 +-- .../producer/method/Sparkly.java | 4 +- .../specialization/simple/Landowner.java | 4 +- .../specialization/simple/Lazy.java | 4 +- .../simple/SimpleBeanSpecializationTest.java | 6 +-- .../CustomInterceptorImplementation.java | 6 +-- .../definition/custom/Secure.java | 4 +- .../definition/custom/Transactional.java | 4 +- .../cdi/tck/tests/full/vetoed/VetoedTest.java | 3 +- .../tck/tests/full/vetoed/aquarium/Fishy.java | 4 +- .../disposal/method/definition/Deadliest.java | 4 +- .../DisposalMethodDefinitionTest.java | 6 +-- .../disposal/method/definition/Tame.java | 4 +- .../producer/field/definition/AsAnimal.java | 4 +- .../producer/field/definition/Foo.java | 4 +- .../producer/field/definition/Pet.java | 4 +- .../ProducerFieldDefinitionTest.java | 15 +++---- .../producer/field/definition/Static.java | 4 +- .../producer/field/definition/Tame.java | 4 +- .../producer/field/lifecycle/Broken.java | 4 +- .../producer/field/lifecycle/Null.java | 4 +- .../lifecycle/ProducerFieldLifecycleTest.java | 9 ++--- .../producer/field/lifecycle/Tame.java | 4 +- .../producer/method/definition/Deadliest.java | 4 +- .../producer/method/definition/Number.java | 4 +- .../ProducerMethodDefinitionTest.java | 21 ++++------ .../producer/method/definition/Tame.java | 4 +- .../producer/method/definition/Yummy.java | 4 +- .../method/definition/name/Crazy.java | 4 +- .../method/definition/name/Funny.java | 4 +- .../ProducerMethodWithDefaultNameTest.java | 6 +-- .../producer/method/lifecycle/Fail.java | 4 +- .../producer/method/lifecycle/FirstBorn.java | 4 +- .../producer/method/lifecycle/Null.java | 4 +- .../producer/method/lifecycle/Pet.java | 4 +- .../ProducerMethodLifecycleTest.java | 12 ++---- .../tests/interceptors/definition/Atomic.java | 4 +- .../definition/InterceptorDefinitionTest.java | 18 +++------ .../tests/interceptors/definition/Logged.java | 4 +- .../definition/MissileBinding.java | 4 +- .../definition/NonBindingType.java | 5 ++- .../tests/interceptors/definition/Secure.java | 4 +- .../lookup/dynamic/DynamicLookupTest.java | 3 +- .../tck/tests/lookup/dynamic/NonBinding.java | 5 ++- .../dynamic/builtin/BuiltinInstanceTest.java | 3 +- .../lookup/dynamic/builtin/FarmBased.java | 4 +- .../lookup/injectionpoint/dynamic/Bar.java | 3 +- .../dynamic/DynamicInjectionPointTest.java | 3 +- .../lookup/injectionpoint/dynamic/Nice.java | 4 +- .../tests/lookup/typesafe/resolution/Max.java | 4 +- .../tests/lookup/typesafe/resolution/Min.java | 4 +- .../lookup/typesafe/resolution/Number.java | 4 +- .../resolution/ResolutionByTypeTest.java | 24 ++++-------- .../lookup/typesafe/resolution/Tame.java | 4 +- .../lookup/typesafe/resolution/Whitefish.java | 4 +- .../lookup/typesafe/resolution/Wild.java | 4 +- .../cdi/tck/tests/vetoed/VetoedTest.java | 3 +- .../cdi/tck/tests/vetoed/aquarium/Fishy.java | 4 +- ...priseInterceptorBindingResolutionTest.java | 28 ++++++------- .../resolution/ejb/LoggedBinding.java | 3 ++ .../resolution/ejb/MessageBinding.java | 3 ++ .../bindings/resolution/ejb/PingBinding.java | 3 ++ .../bindings/resolution/ejb/PongBinding.java | 3 ++ .../resolution/ejb/TransactionalBinding.java | 3 ++ .../resource/DatabaseProduction.java | 3 ++ .../enterprise/resource/DatabaseTest.java | 3 ++ .../ResourceAlternativeAvailabilityTest.java | 6 +-- .../ApplicationContextDisposerTest.java | 3 +- .../context/application/disposer/Edible.java | 4 +- .../bean/types/enterprise/Mock.java | 3 ++ .../enterprise/SessionBeanTypesTest.java | 3 +- .../interceptors/InterceptorExtension.java | 3 +- .../EnterpriseBeanDefinitionTest.java | 3 +- .../enterprise/definition/Tame.java | 4 +- .../RemoteInterfaceNotInAPITypesTest.java | 3 +- .../enterprise/definition/remote/Tame.java | 4 +- .../EnterpriseBeanLifecycleTest.java | 12 ++---- .../enterprise/lifecycle/Important.java | 3 ++ ...EnterpriseProducerFieldDefinitionTest.java | 6 +-- .../field/definition/enterprise/Foo.java | 4 +- ...nterpriseProducerMethodDefinitionTest.java | 15 +++---- .../method/definition/enterprise/Yummy.java | 4 +- .../simple/resource/ejb/EjbInjectionTest.java | 3 +- .../simple/resource/ejb/Lazy.java | 4 +- .../simple/resource/env/EnvInjectionTest.java | 6 +-- .../simple/resource/env/Greeting.java | 3 ++ .../resource/persistenceContext/Database.java | 3 ++ .../PersistenceContextInjectionTest.java | 6 +-- .../simple/resource/resource/Another.java | 3 ++ .../resource/InjectionOfResourceTest.java | 6 +-- .../EnterpriseBeanSpecializationTest.java | 3 +- .../specialization/enterprise/Landowner.java | 4 +- ...priseProducerMethodSpecializationTest.java | 6 +-- .../producer/method/enterprise/Expensive.java | 4 +- .../producer/method/enterprise/Sparkly.java | 4 +- 161 files changed, 496 insertions(+), 360 deletions(-) create mode 100644 impl/src/main/java/org/jboss/cdi/tck/literals/InheritedLiteral.java create mode 100644 impl/src/main/java/org/jboss/cdi/tck/literals/OverrideLiteral.java create mode 100644 impl/src/main/java/org/jboss/cdi/tck/literals/StereotypeLiteral.java diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ConstructorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ConstructorBinding.java index 05559d3f72..4c4339160f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ConstructorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ConstructorBinding.java @@ -25,6 +25,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) @@ -34,4 +35,6 @@ @Documented @InterceptorBinding public @interface ConstructorBinding { + class Literal extends AnnotationLiteral implements ConstructorBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/CreativeBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/CreativeBinding.java index 2536970eec..28c4dcd508 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/CreativeBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/CreativeBinding.java @@ -25,6 +25,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, CONSTRUCTOR }) @@ -33,4 +34,6 @@ @Documented @InterceptorBinding public @interface CreativeBinding { + class Literal extends AnnotationLiteral implements CreativeBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/InterceptorBindingResolutionTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/InterceptorBindingResolutionTest.java index 015022f1f6..f4900f8b79 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/InterceptorBindingResolutionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/InterceptorBindingResolutionTest.java @@ -73,12 +73,12 @@ public void testBusinessMethodInterceptorBindings(MessageService messageService, // Test interceptor is resolved (note non-binding member of BallBinding) assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, - new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new BallBindingLiteral(true, true)).size(), 1); + new MessageBinding.Literal(), + new LoggedBinding.Literal(), + new TransactionalBinding.Literal(), + new PingBinding.Literal(), + new PongBinding.Literal(), + new BallBindingLiteral(true, true)).size(), 1); // Test the set of interceptor bindings assertNotNull(messageService); @@ -101,16 +101,16 @@ public void testLifecycleInterceptorBindings() { // Test interceptor is resolved (note non-binding member of BallBinding) assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.POST_CONSTRUCT, - new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new BasketBindingLiteral(true, true)).size(), 1); + new MessageBinding.Literal(), + new LoggedBinding.Literal(), + new TransactionalBinding.Literal(), + new BasketBindingLiteral(true, true)).size(), 1); assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.PRE_DESTROY, - new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new BasketBindingLiteral(true, true)).size(), 1); + new MessageBinding.Literal(), + new LoggedBinding.Literal(), + new TransactionalBinding.Literal(), + new BasketBindingLiteral(true, true)).size(), 1); // Test the set of interceptor bindings ComplicatedLifecycleInterceptor.reset(); @@ -134,12 +134,11 @@ public void testConstructorInterceptorBindings() { // Test interceptor is resolved assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.AROUND_CONSTRUCT, - new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }).size(), 1); + new MachineBinding.Literal(), + new LoggedBinding.Literal(), + new TransactionalBinding.Literal(), + new ConstructorBinding.Literal(), + new CreativeBinding.Literal()).size(), 1); // Test the set of interceptor bindings ComplicatedAroundConstructInterceptor.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/LoggedBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/LoggedBinding.java index cd7d1ca91a..c70abbc8fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/LoggedBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/LoggedBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) @@ -32,4 +33,6 @@ @Documented @InterceptorBinding public @interface LoggedBinding { + class Literal extends AnnotationLiteral implements LoggedBinding { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MachineBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MachineBinding.java index 833489b3a5..220cf68376 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MachineBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MachineBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target(TYPE) @@ -32,4 +33,6 @@ @Documented @InterceptorBinding public @interface MachineBinding { + class Literal extends AnnotationLiteral implements MachineBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MessageBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MessageBinding.java index acf0e43856..5c3cddd32c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MessageBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/MessageBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) @@ -32,4 +33,6 @@ @Documented @InterceptorBinding public @interface MessageBinding { + class Literal extends AnnotationLiteral implements MessageBinding { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PingBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PingBinding.java index 144115d0a5..50ec767013 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PingBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PingBinding.java @@ -25,6 +25,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -34,4 +35,6 @@ @Documented @InterceptorBinding public @interface PingBinding { + class Literal extends AnnotationLiteral implements PingBinding { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PongBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PongBinding.java index 0e609ecbaf..a7c6b19c0c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PongBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/PongBinding.java @@ -25,6 +25,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -34,4 +35,6 @@ @Documented @InterceptorBinding public @interface PongBinding { + class Literal extends AnnotationLiteral implements PongBinding { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/TransactionalBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/TransactionalBinding.java index c917692ccc..fb428add88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/TransactionalBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/TransactionalBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) @@ -32,4 +33,6 @@ @Documented @InterceptorBinding public @interface TransactionalBinding { + class Literal extends AnnotationLiteral implements TransactionalBinding { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/literals/InheritedLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/literals/InheritedLiteral.java new file mode 100644 index 0000000000..0c40a46d35 --- /dev/null +++ b/impl/src/main/java/org/jboss/cdi/tck/literals/InheritedLiteral.java @@ -0,0 +1,9 @@ +package org.jboss.cdi.tck.literals; + +import jakarta.enterprise.util.AnnotationLiteral; + +import java.lang.annotation.Inherited; + +public class InheritedLiteral extends AnnotationLiteral implements Inherited { + public static InheritedLiteral INSTANCE = new InheritedLiteral(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/literals/OverrideLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/literals/OverrideLiteral.java new file mode 100644 index 0000000000..9c22365dcf --- /dev/null +++ b/impl/src/main/java/org/jboss/cdi/tck/literals/OverrideLiteral.java @@ -0,0 +1,7 @@ +package org.jboss.cdi.tck.literals; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class OverrideLiteral extends AnnotationLiteral implements Override { + public static OverrideLiteral INSTANCE = new OverrideLiteral(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/literals/StereotypeLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/literals/StereotypeLiteral.java new file mode 100644 index 0000000000..08aebd2cbb --- /dev/null +++ b/impl/src/main/java/org/jboss/cdi/tck/literals/StereotypeLiteral.java @@ -0,0 +1,8 @@ +package org.jboss.cdi.tck.literals; + +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.util.AnnotationLiteral; + +public class StereotypeLiteral extends AnnotationLiteral implements Stereotype { + public static StereotypeLiteral INSTANCE = new StereotypeLiteral(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DependentContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DependentContextTest.java index 408559eee7..d0cc9ec9c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DependentContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DependentContextTest.java @@ -50,10 +50,8 @@ @SpecVersion(spec = "cdi", version = "2.0") public class DependentContextTest extends AbstractTest { - private static final Annotation TAME_LITERAL = new AnnotationLiteral() { - }; - private static final Annotation PET_LITERAL = new AnnotationLiteral() { - }; + private static final Annotation TAME_LITERAL = new Tame.Literal(); + private static final Annotation PET_LITERAL = new Pet.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Pet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Pet.java index 35413409ac..841eddfb33 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Pet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Pet.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Pet { - + class Literal extends AnnotationLiteral implements Pet { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tame.java index 679bd11d4a..7ad0bb925e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/StereotypeDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/StereotypeDefinitionTest.java index 073e2c5fe2..980a8d78dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/StereotypeDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/StereotypeDefinitionTest.java @@ -44,8 +44,7 @@ @SpecVersion(spec = "cdi", version = "2.0") public class StereotypeDefinitionTest extends AbstractTest { - private static final Annotation TAME_LITERAL = new AnnotationLiteral() { - }; + private static final Annotation TAME_LITERAL = new Tame.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Tame.java index e1b360496f..2ead71196c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventBindingTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventBindingTypesTest.java index 71aeb632d2..bfbd37d0b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventBindingTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventBindingTypesTest.java @@ -80,13 +80,13 @@ public void testNonRuntimeBindingTypeIsNotAnEventBindingType() { @Test(expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = EVENT_TYPES_AND_QUALIFIER_TYPES, id = "d") public void testFireEventWithNonRuntimeBindingTypeFails() { - getCurrentManager().getEvent().select(Animal.class, new AnnotationLiteral() {}).fire(new Animal()); + getCurrentManager().getEvent().select(Animal.class, new NonRuntimeBindingType.Literal()).fire(new Animal()); } @Test(expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = EVENT_TYPES_AND_QUALIFIER_TYPES, id = "g") public void testFireEventWithNonBindingAnnotationsFails() { - getCurrentManager().getEvent().select(Animal.class, new AnnotationLiteral() {}).fire(new Animal()); + getCurrentManager().getEvent().select(Animal.class, new NonBindingType.Literal()).fire(new Animal()); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonBindingType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonBindingType.java index fe091d1bf1..e335aa9058 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonBindingType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonBindingType.java @@ -16,6 +16,8 @@ */ package org.jboss.cdi.tck.tests.event.bindingTypes; +import jakarta.enterprise.util.AnnotationLiteral; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -26,4 +28,6 @@ @Target({ FIELD, PARAMETER }) @Retention(RUNTIME) public @interface NonBindingType { + class Literal extends AnnotationLiteral implements NonBindingType { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonRuntimeBindingType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonRuntimeBindingType.java index 300d1659d9..7a35c52251 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonRuntimeBindingType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/NonRuntimeBindingType.java @@ -23,10 +23,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ FIELD, PARAMETER }) @Qualifier @Retention(RetentionPolicy.CLASS) public @interface NonRuntimeBindingType { + class Literal extends AnnotationLiteral implements NonRuntimeBindingType { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypesTest.java index acc1239125..9ef4da9225 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypesTest.java @@ -41,8 +41,7 @@ @SpecVersion(spec = "cdi", version = "2.0") public class EventTypesTest extends AbstractTest { - private AnnotationLiteral extraLiteral = new AnnotationLiteral() { - }; + private AnnotationLiteral extraLiteral = new Extra.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Extra.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Extra.java index fdce6bf25f..21929be904 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Extra.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Extra.java @@ -10,6 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -17,4 +18,6 @@ @Documented @Qualifier public @interface Extra { + class Literal extends AnnotationLiteral implements Extra { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/MiniBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/MiniBar.java index 96271e4317..c8d67e2551 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/MiniBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/MiniBar.java @@ -82,8 +82,7 @@ public void restoreItem(Item item) { throw new IllegalArgumentException("Item already restored"); } - itemEvent.select(new AnnotationLiteral() { - }).fire(item); + itemEvent.select(new Restored.Literal()).fire(item); } public void stock() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Restored.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Restored.java index 24eaebccdf..cbed45df79 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Restored.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Restored.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface Restored { + class Literal extends AnnotationLiteral implements Restored { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/Number.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/Number.java index ce94e60058..e1a9cc84d9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/Number.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/Number.java @@ -10,6 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -17,6 +18,7 @@ @Documented @Qualifier public @interface Number { - + class Literal extends AnnotationLiteral implements Number { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ObserverMethodTest.java index e078a53844..821dba9dcf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ObserverMethodTest.java @@ -135,8 +135,7 @@ public void testInstanceOfBeanForEveryEnabledObserverMethod() { @SpecAssertion(section = OBSERVER_METHOD, id = "f") public void testNotifyOnObserverMethod() { Integer event = Integer.valueOf(1); - Set> observerMethods = getCurrentManager().resolveObserverMethods(event, new AnnotationLiteral() { - }); + Set> observerMethods = getCurrentManager().resolveObserverMethods(event, new Number.Literal()); assertEquals(observerMethods.size(), 1); observerMethods.iterator().next().notify(event); assertTrue(IntegerObserver.wasNotified); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/ResolveEventObserversTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/ResolveEventObserversTest.java index ea1c8790e0..e108c8c82a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/ResolveEventObserversTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/ResolveEventObserversTest.java @@ -36,10 +36,10 @@ import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.ObserverMethod; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; +import org.jboss.cdi.tck.literals.OverrideLiteral; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; @@ -120,15 +120,13 @@ public void testBeanManagerResolveObserversSignature() throws Exception { @Test(expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "e") public void testBeanManagerResolveObserversWithIllegalQualifier() { - getCurrentManager().resolveObserverMethods(new SimpleEventType(), new AnnotationLiteral() { - }); + getCurrentManager().resolveObserverMethods(new SimpleEventType(), OverrideLiteral.INSTANCE); } @Test @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "o") public void testObserverMethodAutomaticallyRegistered() { - assertFalse(getCurrentManager().resolveObserverMethods(new String(), new AnnotationLiteral() { - }).isEmpty()); + assertFalse(getCurrentManager().resolveObserverMethods(new String(), new Secret.Literal()).isEmpty()); } @Test @@ -138,8 +136,7 @@ public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans() { assertEquals(ghostObservers.size(), 0); Set> stringObservers = getCurrentManager().resolveObserverMethods(new String(), - new AnnotationLiteral() { - }); + new Secret.Literal()); assertEquals(stringObservers.size(), 1); for (ObserverMethod observer : stringObservers) { // an assertion error will be raised if an inappropriate observer is called diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Secret.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Secret.java index ddf1c08d48..7dbc53c723 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Secret.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Secret.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface Secret { + class Literal extends AnnotationLiteral implements Secret { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/NotABindingType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/NotABindingType.java index afc1d0dcde..fef0142c5d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/NotABindingType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/NotABindingType.java @@ -16,6 +16,8 @@ */ package org.jboss.cdi.tck.tests.event.select; +import jakarta.enterprise.util.AnnotationLiteral; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; @@ -30,4 +32,6 @@ @Retention(RUNTIME) @Documented public @interface NotABindingType { + class Literal extends AnnotationLiteral implements NotABindingType { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SelectEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SelectEventTest.java index 3dcc892564..a3e7e0ca2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SelectEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SelectEventTest.java @@ -69,8 +69,7 @@ public void testEventSelectReturnsEventOfSameType() { assert alarm.getNumBreakIns() == 1; assert alarm.getNumViolentBreakIns() == 0; - sensor.securityEvent.select(BreakInEvent.class, new AnnotationLiteral() { - }).fire(new BreakInEvent()); + sensor.securityEvent.select(BreakInEvent.class, new Violent.Literal()).fire(new BreakInEvent()); assert alarm.getNumSecurityEvents() == 4; assert alarm.getNumSystemTests() == 1; assert alarm.getNumBreakIns() == 2; @@ -107,15 +106,13 @@ public void testEventSelectWithSubtypeThrowsExceptionForDuplicateBindingType() { @SpecAssertion(section = EVENT, id = "ec") public void testEventSelectThrowsExceptionIfAnnotationIsNotBindingType() { SecuritySensor sensor = getContextualReference(SecuritySensor.class); - sensor.securityEvent.select(new AnnotationLiteral() { - }); + sensor.securityEvent.select(new NotABindingType.Literal()); } @Test(expectedExceptions = IllegalArgumentException.class) @SpecAssertion(section = EVENT, id = "ec") public void testEventSelectWithSubtypeThrowsExceptionIfAnnotationIsNotBindingType() { SecuritySensor sensor = getContextualReference(SecuritySensor.class); - sensor.securityEvent.select(BreakInEvent.class, new AnnotationLiteral() { - }); + sensor.securityEvent.select(BreakInEvent.class, new NotABindingType.Literal()); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/Violent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/Violent.java index c5c47a6f60..6e53a3a8bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/Violent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/Violent.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface Violent { + class Literal extends AnnotationLiteral implements Violent { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/AlternativeAvailabilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/AlternativeAvailabilityTest.java index 463008cd06..7a3c62ed98 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/AlternativeAvailabilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/AlternativeAvailabilityTest.java @@ -59,12 +59,10 @@ public static WebArchive createTestArchive() { } @SuppressWarnings("serial") - private static final AnnotationLiteral WILD_LITERAL = new AnnotationLiteral() { - }; + private static final AnnotationLiteral WILD_LITERAL = new Wild.Literal(); @SuppressWarnings("serial") - private static final AnnotationLiteral TAME_LITERAL = new AnnotationLiteral() { - }; + private static final AnnotationLiteral TAME_LITERAL = new Tame.Literal(); @Test @SpecAssertion(section = SELECTION, id = "e") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Tame.java index abc9d8c8c1..e1cc3fd205 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Tame.java @@ -22,6 +22,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; import java.lang.annotation.Retention; @@ -31,5 +32,6 @@ @Retention(RUNTIME) @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Wild.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Wild.java index d5828983d8..874e62be0b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Wild.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Wild.java @@ -22,6 +22,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; import java.lang.annotation.Retention; @@ -31,5 +32,6 @@ @Retention(RUNTIME) @Qualifier public @interface Wild { - + class Literal extends AnnotationLiteral implements Wild { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/DecoratorDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/DecoratorDefinitionTest.java index aa8e4163de..8aed336474 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/DecoratorDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/DecoratorDefinitionTest.java @@ -155,24 +155,21 @@ public void testInstanceOfDecoratorForEachEnabled() { @Test(expectedExceptions = IllegalArgumentException.class) @SpecAssertion(section = BM_DECORATOR_RESOLUTION, id = "c") public void testDuplicateBindingsOnResolveDecoratorsFails() { - Annotation binding = new AnnotationLiteral() { - }; + Annotation binding = new Meta.Literal(); getCurrentManager().resolveDecorators(FooBar.TYPES, binding, binding); } @Test(expectedExceptions = IllegalArgumentException.class) @SpecAssertion(section = BM_DECORATOR_RESOLUTION, id = "d") public void testNonBindingsOnResolveDecoratorsFails() { - Annotation binding = new AnnotationLiteral() { - }; + Annotation binding = new NonMeta.Literal(); getCurrentManager().resolveDecorators(FooBar.TYPES, binding); } @Test(expectedExceptions = IllegalArgumentException.class) @SpecAssertion(section = BM_DECORATOR_RESOLUTION, id = "e") public void testEmptyTypeSetOnResolveDecoratorsFails() { - Annotation binding = new AnnotationLiteral() { - }; + Annotation binding = new NonMeta.Literal(); getCurrentManager().resolveDecorators(new HashSet(), binding); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Meta.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Meta.java index 375d48e9c2..d978779f81 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Meta.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Meta.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Meta { - + class Literal extends AnnotationLiteral implements Meta { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/NonMeta.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/NonMeta.java index ec7e71a775..04a3a77452 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/NonMeta.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/NonMeta.java @@ -16,6 +16,8 @@ */ package org.jboss.cdi.tck.tests.full.decorators.definition; +import jakarta.enterprise.util.AnnotationLiteral; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; @@ -30,5 +32,6 @@ @Retention(RUNTIME) @Documented public @interface NonMeta { - + class Literal extends AnnotationLiteral implements NonMeta { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/AlternativeMetadataTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/AlternativeMetadataTest.java index 252a0e21fd..59c0217b42 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/AlternativeMetadataTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/AlternativeMetadataTest.java @@ -318,10 +318,8 @@ public void testExtraQualifierAppliedToObservesMethodParameter() { public void testContainerUsesOperationsOfAnnotatedNotReflectionApi() { assertEquals(getBeans(Sausage.class, Any.Literal.INSTANCE).size(), 1); // Overriding annotated type has no methods and fields and thus there are no cheap and expensive sausages - assertTrue(getBeans(Sausage.class, new AnnotationLiteral() { - }).isEmpty()); - assertTrue(getBeans(Sausage.class, new AnnotationLiteral() { - }).isEmpty()); + assertTrue(getBeans(Sausage.class, new Expensive.Literal()).isEmpty()); + assertTrue(getBeans(Sausage.class, new Cheap.Literal()).isEmpty()); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Cheap.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Cheap.java index 2e9b713383..6251d1861f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Cheap.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Cheap.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Cheap { - + class Literal extends AnnotationLiteral implements Cheap { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Expensive.java index d6b2c1fab2..cc9d531793 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Expensive.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Expensive { - + class Literal extends AnnotationLiteral implements Expensive { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptorBinding.java index 157df4ece7..d4951cec98 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptorBinding.java @@ -23,11 +23,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target({ TYPE, METHOD }) @Retention(RUNTIME) public @interface GroceryInterceptorBinding { - + class Literal extends AnnotationLiteral implements GroceryInterceptorBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryWrapper.java index 6c21021340..96a4ea53a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryWrapper.java @@ -36,6 +36,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; + +import org.jboss.cdi.tck.literals.ProducesLiteral; import org.jboss.cdi.tck.util.annotated.AnnotatedConstructorWrapper; import org.jboss.cdi.tck.util.annotated.AnnotatedFieldWrapper; import org.jboss.cdi.tck.util.annotated.AnnotatedMethodWrapper; @@ -53,9 +55,8 @@ public class GroceryWrapper extends AnnotatedTypeWrapper { private static boolean getTypeClosureOfProducerMethodUsed = false; public GroceryWrapper(AnnotatedType delegate) { - super(delegate, false, RequestScoped.Literal.INSTANCE, new CheapLiteral(), new AnnotationLiteral() { - }, new AnnotationLiteral() { - }); + super(delegate, false, RequestScoped.Literal.INSTANCE, new CheapLiteral(), new NamedStereotype.Literal(), + new GroceryInterceptorBinding.Literal()); typeClosure.add(Grocery.class); typeClosure.add(Object.class); } @@ -91,8 +92,7 @@ public Set> getFields() { } else if (field.getJavaMember().getName().equals("fruit")) { fields.add(wrapFruitField(field, this, new CheapLiteral())); } else if (field.getBaseType().equals(Bread.class)) { - fields.add(wrapField(field, this, new AnnotationLiteral() { - })); + fields.add(wrapField(field, this, ProducesLiteral.INSTANCE)); } else { fields.add(new AnnotatedFieldWrapper(field, this, true)); } @@ -108,14 +108,12 @@ public Set> getMethods() { if (method.getJavaMember().getName().equals("getMilk")) { AnnotatedMethodWrapper wrappedMethod = new AnnotatedMethodWrapper(method, this, false, - new AnnotationLiteral() { - }); + ProducesLiteral.INSTANCE); methods.add(wrappedMethod); } else if (method.getJavaMember().getName().equals("getYogurt")) { // wrap the method and its parameters AnnotatedMethodWrapper wrappedMethod = new AnnotatedMethodWrapper(method, this, false, new ExpensiveLiteral(), - new AnnotationLiteral() { - }); + ProducesLiteral.INSTANCE); methods.add(wrapMethodParameters(method.getParameters(), wrappedMethod, false, new CheapLiteral())); } else if (method.getJavaMember().getName().equals("nonInjectAnnotatedInitializer")) { AnnotatedMethodWrapper wrappedMethod = new AnnotatedMethodWrapper(method, this, true, diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/NamedStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/NamedStereotype.java index 055b2f9ceb..c64099336f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/NamedStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/NamedStereotype.java @@ -23,6 +23,7 @@ import java.lang.annotation.Target; import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Named; @Target(TYPE) @@ -30,5 +31,6 @@ @Stereotype @Named public @interface NamedStereotype { - + class Literal extends AnnotationLiteral implements NamedStereotype { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java index e7903a6829..05a1b9474b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorInjectionTargetTest.java @@ -67,11 +67,9 @@ public void testInterceptorInterceptsOnlyBindedClass() { final AnnotatedType interceptedLogin = manager.createAnnotatedType(Login.class); AnnotatedType modifiedInterceptedLogin = new ForwardingAnnotatedType() { @SuppressWarnings("serial") - private final AnnotationLiteral interceptorBinding = new AnnotationLiteral() { - }; + private final AnnotationLiteral interceptorBinding = new LoginInterceptorBinding.Literal(); @SuppressWarnings("serial") - private final AnnotationLiteral securedAnnotation = new AnnotationLiteral() { - }; + private final AnnotationLiteral securedAnnotation = new Secured.Literal(); @Override public AnnotatedType delegate() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/InterceptorExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/InterceptorExtension.java index 971799207a..6638e438c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/InterceptorExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/InterceptorExtension.java @@ -36,11 +36,9 @@ public void registerAdditionalLoginAnnotatedType(@Observes BeforeBeanDiscovery e final AnnotatedType interceptedLogin = manager.createAnnotatedType(Login.class); AnnotatedType modifiedInterceptedLogin = new ForwardingAnnotatedType() { @SuppressWarnings("serial") - private final AnnotationLiteral interceptorBinding = new AnnotationLiteral() { - }; + private final AnnotationLiteral interceptorBinding = new LoginInterceptorBinding.Literal(); @SuppressWarnings("serial") - private final AnnotationLiteral securedAnnotation = new AnnotationLiteral() { - }; + private final AnnotationLiteral securedAnnotation = new Secured.Literal(); @Override public AnnotatedType delegate() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptorBinding.java index d379b1822d..646fd35566 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptorBinding.java @@ -23,11 +23,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Target({ TYPE, METHOD }) @Retention(RUNTIME) public @interface LoginInterceptorBinding { - + class Literal extends AnnotationLiteral implements LoginInterceptorBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/Secured.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/Secured.java index 2cacf2191c..cff25cca06 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/Secured.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/Secured.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @@ -34,5 +35,6 @@ @Documented @Qualifier public @interface Secured { - + class Literal extends AnnotationLiteral implements Secured { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/BeanManagerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/BeanManagerTest.java index 3c6a121526..f39b271546 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/BeanManagerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/BeanManagerTest.java @@ -46,7 +46,9 @@ import jakarta.interceptor.InterceptorBinding; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; +import org.jboss.cdi.tck.literals.InheritedLiteral; import org.jboss.cdi.tck.literals.RetentionLiteral; +import org.jboss.cdi.tck.literals.StereotypeLiteral; import org.jboss.cdi.tck.literals.TargetLiteral; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.beanContainer.BeanContainerTest; @@ -101,11 +103,9 @@ public void testValidateThrowsException() { public void testGetMetaAnnotationsForStereotype() { Set stereotypeAnnotations = getCurrentManager().getStereotypeDefinition(AnimalStereotype.class); assertEquals(stereotypeAnnotations.size(), 5); - assertTrue(stereotypeAnnotations.contains(new AnnotationLiteral() { - })); + assertTrue(stereotypeAnnotations.contains(StereotypeLiteral.INSTANCE)); assertTrue(stereotypeAnnotations.contains(RequestScoped.Literal.INSTANCE)); - assertTrue(stereotypeAnnotations.contains(new AnnotationLiteral() { - })); + assertTrue(stereotypeAnnotations.contains(InheritedLiteral.INSTANCE)); assertTrue(stereotypeAnnotations.contains(new RetentionLiteral() { public RetentionPolicy value() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Transactional.java index a74ddf1d1b..2eae99cbda 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Transactional.java @@ -5,6 +5,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; @@ -17,5 +18,6 @@ @Retention(RUNTIME) @Documented public @interface Transactional { - + class Literal extends AnnotationLiteral implements Transactional { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/WrongExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/WrongExtension.java index dca915edbb..6596c6c686 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/WrongExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/WrongExtension.java @@ -121,8 +121,7 @@ void execute() { new Invocation() { void execute() { - beanManager.resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral() { - }); + beanManager.resolveInterceptors(InterceptionType.AROUND_INVOKE, new Transactional.Literal()); } }.run(); @@ -178,8 +177,7 @@ private void testAvailableMethodsInABD(BeanManager beanManager) { beanManager.getBeans(Foo.class); beanManager.resolve(null); beanManager.resolveObserverMethods(new Foo()); - beanManager.resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral() { - }); + beanManager.resolveInterceptors(InterceptionType.AROUND_INVOKE, new Transactional.Literal()); beanManager.resolveDecorators(new HashSet(Arrays.asList(Foo.class))); beanManager.validate(injectionPoint); beanManager.getPassivationCapableBean("foo"); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/Baz.java index 5ab2a9ef52..608d01ef66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/Baz.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Baz { - + class Literal extends AnnotationLiteral implements Baz { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionBeta.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionBeta.java index e293d0f9a9..7d64b20604 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionBeta.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionBeta.java @@ -34,7 +34,7 @@ public class ExtensionBeta implements Extension { @SuppressWarnings("serial") public void observeProcessAnnotatedType(@Observes ProcessBean event, BeanManager beanManager) { if (event.getBean().getBeanClass().equals(Foo.class) || event.getBean().getBeanClass().equals(Bar.class)) { - beanManager.getEvent().select(PbEvent.class, new AnnotationLiteral() {}).fire(new PbEvent(event.getBean().getBeanClass())); + beanManager.getEvent().select(PbEvent.class, new Baz.Literal()).fire(new PbEvent(event.getBean().getBeanClass())); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java index ba9e1a0fa1..a6976ad08b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryTest.java @@ -181,12 +181,10 @@ public void testAddAnnotatedType() { getUniqueBean(Boss.class); assertEquals(getBeans(Bar.class).size(), 0); - assertEquals(getBeans(Bar.class, new AnnotationLiteral() { - }).size(), 1); + assertEquals(getBeans(Bar.class, Pro.ProLiteral.INSTANCE).size(), 1); assertEquals(getBeans(Foo.class).size(), 0); - assertEquals(getBeans(Foo.class, new AnnotationLiteral() { - }).size(), 1); + assertEquals(getBeans(Foo.class, Pro.ProLiteral.INSTANCE).size(), 1); } @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryObserver.java index 3079e90383..2c36c285a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryObserver.java @@ -82,8 +82,7 @@ public void addQualifierByAnnotatedType(@Observes BeforeBeanDiscovery beforeBean for (final AnnotatedMethod method : super.getMethods()) { if ("level".equals(method.getJavaMember().getName())) { methods.add(new AnnotatedMethodWrapper((AnnotatedMethod) method, this, true, - new AnnotationLiteral() { - })); + new Nonbinding.Literal())); } else { methods.add(new AnnotatedMethodWrapper((AnnotatedMethod) method, this, true)); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryTest.java index f8d2fda736..3b0267fa41 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/BeforeBeanDiscoveryTest.java @@ -85,8 +85,7 @@ public void testAddingScopeType() { public void testAddingQualifierByClass() { assertTrue(BeforeBeanDiscoveryObserver.isObserved()); assertEquals(getBeans(Alligator.class).size(), 0); - assertEquals(getBeans(Alligator.class, new AnnotationLiteral() { - }).size(), 1); + assertEquals(getBeans(Alligator.class, new Tame.Literal()).size(), 1); assertTrue(getCurrentManager().isQualifier(Tame.class)); } @@ -129,11 +128,9 @@ public String level() { public void testAddAnnotatedType() { getUniqueBean(Boss.class); assertEquals(getBeans(Bar.class).size(), 0); - assertEquals(getBeans(Bar.class, new AnnotationLiteral() { - }).size(), 1); + assertEquals(getBeans(Bar.class, Pro.ProLiteral.INSTANCE).size(), 1); assertEquals(getBeans(Foo.class).size(), 0); - assertEquals(getBeans(Foo.class, new AnnotationLiteral() { - }).size(), 1); + assertEquals(getBeans(Foo.class, Pro.ProLiteral.INSTANCE).size(), 1); } @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Tame.java index aa26ce3e71..ab6870404b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Tame.java @@ -16,6 +16,8 @@ */ package org.jboss.cdi.tck.tests.full.extensions.lifecycle.bbd; +import jakarta.enterprise.util.AnnotationLiteral; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; @@ -30,5 +32,6 @@ @Retention(RUNTIME) @Documented public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Noisy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Noisy.java index 5b7878c25f..be3b946998 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Noisy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Noisy.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Noisy { - + class Literal extends AnnotationLiteral implements Noisy { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerTest.java index 0a73d2b72b..f372198ec1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerTest.java @@ -141,8 +141,7 @@ public void testGetInjectionPointsForConstructorAndInitializer() { @SpecAssertion(section = PROCESS_PRODUCER, id = "da"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jb") }) public void testProduceCallsProducerMethod() { Producer producer = ProducerProcessor.getNoisyDogProducer(); - Bean dogBean = getUniqueBean(Dog.class, new AnnotationLiteral() { - }); + Bean dogBean = getUniqueBean(Dog.class, new Noisy.Literal()); DogProducer.reset(); Dog dog = producer.produce(getCurrentManager().createCreationalContext(dogBean)); assert DogProducer.isNoisyDogProducerCalled(); @@ -153,8 +152,7 @@ public void testProduceCallsProducerMethod() { @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "e"), @SpecAssertion(section = PROCESS_PRODUCER, id = "ga") }) public void testSetProducerOverridesProducer() { ProducerProcessor.reset(); - assert getContextualReference(Cow.class, new AnnotationLiteral() { - }) instanceof Cow; + assert getContextualReference(Cow.class, new Noisy.Literal()) instanceof Cow; assert ProducerProcessor.isOverriddenCowProducerCalled(); } @@ -164,8 +162,7 @@ assert getContextualReference(Cow.class, new AnnotationLiteral() { @SpecAssertion(section = PROCESS_PRODUCER, id = "db"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jb") }) public void testProduceAccessesProducerField() { Producer producer = ProducerProcessor.getQuietDogProducer(); - Bean dogBean = getUniqueBean(Dog.class, new AnnotationLiteral() { - }); + Bean dogBean = getUniqueBean(Dog.class, new Quiet.Literal()); DogProducer.reset(); Dog dog = producer.produce(getCurrentManager().createCreationalContext(dogBean)); assert dog.getColor().equals(DogProducer.QUIET_DOG_COLOR); @@ -175,8 +172,7 @@ public void testProduceAccessesProducerField() { @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "faa") }) public void testProducerForMethodDisposesProduct() { - Bean dogBean = getUniqueBean(Dog.class, new AnnotationLiteral() { - }); + Bean dogBean = getUniqueBean(Dog.class, new Noisy.Literal()); Producer producer = ProducerProcessor.getNoisyDogProducer(); DogProducer.reset(); Dog dog = producer.produce(getCurrentManager().createCreationalContext(dogBean)); @@ -212,8 +208,7 @@ public void testInjectionTargetInject() { @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "j"), @SpecAssertion(section = INJECTIONTARGET_EE, id = "b") }) public void testInjectionTargetPostConstruct() { InjectionTarget injectionTarget = ProducerProcessor.getDogInjectionTarget(); - Dog dog = getContextualReference(Dog.class, new AnnotationLiteral() { - }); + Dog dog = getContextualReference(Dog.class, new Noisy.Literal()); Dog.setPostConstructCalled(false); injectionTarget.postConstruct(dog); assert Dog.isPostConstructCalled(); @@ -223,8 +218,7 @@ public void testInjectionTargetPostConstruct() { @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "k"), @SpecAssertion(section = INJECTIONTARGET_EE, id = "c") }) public void testInjectionTargetPreDestroy() { InjectionTarget injectionTarget = ProducerProcessor.getDogInjectionTarget(); - Dog dog = getContextualReference(Dog.class, new AnnotationLiteral() { - }); + Dog dog = getContextualReference(Dog.class, new Noisy.Literal()); Dog.setPreDestroyCalled(false); injectionTarget.preDestroy(dog); assert Dog.isPreDestroyCalled(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Quiet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Quiet.java index c5764b04cd..7c9b5b2ecf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Quiet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Quiet.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Quiet { - + class Literal extends AnnotationLiteral implements Quiet { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/ProducerMethodDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/ProducerMethodDefinitionTest.java index 771d207e75..a9c2eafa8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/ProducerMethodDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/ProducerMethodDefinitionTest.java @@ -29,9 +29,7 @@ public static WebArchive createTestArchive() { @Test(expectedExceptions = UnsatisfiedResolutionException.class) @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "da"), @SpecAssertion(section = SPECIALIZATION, id = "cb") }) public void testNonStaticProducerMethodNotInheritedBySpecializingSubclass() { - assertEquals(getBeans(Egg.class, new AnnotationLiteral() { - }).size(), 0); - getContextualReference(Egg.class, new AnnotationLiteral() { - }); + assertEquals(getBeans(Egg.class, new Yummy.Literal()).size(), 0); + getContextualReference(Egg.class, new Yummy.Literal()); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Yummy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Yummy.java index 59658a33b9..ebaaaa2c6b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Yummy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Yummy.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Yummy { - + class Literal extends AnnotationLiteral implements Yummy { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Pet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Pet.java index 7056c2e89b..b6a2509002 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Pet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Pet.java @@ -22,6 +22,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; import java.lang.annotation.Documented; @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Pet { - + class Literal extends AnnotationLiteral implements Pet { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java index f97320f44d..4d9308a38c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java @@ -20,8 +20,7 @@ @Test(groups = CDI_FULL) public class ProducerMethodLifecycleTest extends AbstractTest { - private AnnotationLiteral PET_LITERAL = new AnnotationLiteral() { - }; + private AnnotationLiteral PET_LITERAL = new Pet.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java index f1ef301809..9971336517 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java @@ -22,8 +22,7 @@ @Test(groups = CDI_FULL) public class SimpleBeanLifecycleTest extends AbstractTest { - private static final Annotation TAME_LITERAL = new AnnotationLiteral() { - }; + private static final Annotation TAME_LITERAL = new Tame.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Tame.java index eac9710008..fce53c66e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Expensive.java index 166ac71712..cbcf9a438a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Expensive.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Expensive { - + class Literal extends AnnotationLiteral implements Expensive { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java index ebe5bdd16a..a83694e395 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java @@ -46,11 +46,9 @@ public class ProducerMethodSpecializationTest extends AbstractTest { @SuppressWarnings("serial") - private static Annotation EXPENSIVE_LITERAL = new AnnotationLiteral() { - }; + private static Annotation EXPENSIVE_LITERAL = new Expensive.Literal(); @SuppressWarnings("serial") - private static Annotation SPARKLY_LITERAL = new AnnotationLiteral() { - }; + private static Annotation SPARKLY_LITERAL = new Sparkly.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Sparkly.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Sparkly.java index 19356237ec..63a9c01a32 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Sparkly.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Sparkly.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Sparkly { - + class Literal extends AnnotationLiteral implements Sparkly { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Landowner.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Landowner.java index 6e0a359999..1492bbfc5c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Landowner.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Landowner.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Landowner { - + class Literal extends AnnotationLiteral implements Landowner { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Lazy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Lazy.java index df3b2075cd..1f97ec9e26 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Lazy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Lazy.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Lazy { - + class Literal extends AnnotationLiteral implements Lazy { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/SimpleBeanSpecializationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/SimpleBeanSpecializationTest.java index 1c10b62bcd..4ba615c9a5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/SimpleBeanSpecializationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/SimpleBeanSpecializationTest.java @@ -48,12 +48,10 @@ public class SimpleBeanSpecializationTest extends AbstractTest { @SuppressWarnings("serial") - private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral() { - }; + private static Annotation LANDOWNER_LITERAL = new Landowner.Literal(); @SuppressWarnings("serial") - private static Annotation LAZY_LITERAL = new AnnotationLiteral() { - }; + private static Annotation LAZY_LITERAL = new Lazy.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorImplementation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorImplementation.java index 00fcc36edb..86f2b3bcf4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorImplementation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorImplementation.java @@ -39,10 +39,8 @@ public class CustomInterceptorImplementation implements Interceptor() { - }); - interceptorBindingTypes.add(new AnnotationLiteral() { - }); + interceptorBindingTypes.add(new Secure.Literal()); + interceptorBindingTypes.add(new Transactional.Literal()); } public Set getInjectionPoints() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Secure.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Secure.java index c952a46770..6fcae8e1c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Secure.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Secure.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -31,5 +32,6 @@ @Documented @InterceptorBinding public @interface Secure { - + class Literal extends AnnotationLiteral implements Secure { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Transactional.java index e114369dd6..2468a129a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/Transactional.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -31,5 +32,6 @@ @Documented @InterceptorBinding public @interface Transactional { - + class Literal extends AnnotationLiteral implements Transactional { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VetoedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VetoedTest.java index 658b21054a..01048e8baf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VetoedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VetoedTest.java @@ -94,8 +94,7 @@ public void testPackageLevelVeto() { assertTrue(verifyingExtension.getClasses().contains(Shark.class)); assertEquals(getCurrentManager().getBeans(Piranha.class, Any.Literal.INSTANCE).size(), 0); assertEquals(getCurrentManager().getBeans(Shark.class, Any.Literal.INSTANCE).size(), 1); - assertEquals(getCurrentManager().getBeans(Shark.class, new AnnotationLiteral() { - }).size(), 1); + assertEquals(getCurrentManager().getBeans(Shark.class, new Fishy.Literal()).size(), 1); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Fishy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Fishy.java index 45f54f17c5..b7bfb41628 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Fishy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Fishy.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Fishy { - + class Literal extends AnnotationLiteral implements Fishy { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Deadliest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Deadliest.java index bbbaf30ae0..cf7c495f63 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Deadliest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Deadliest.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Deadliest { - + class Literal extends AnnotationLiteral implements Deadliest { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java index 55cac1ca2c..ed535604d5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java @@ -49,12 +49,10 @@ public class DisposalMethodDefinitionTest extends AbstractTest { @SuppressWarnings("serial") - private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral() { - }; + private static final Annotation DEADLIEST_LITERAL = new Deadliest.Literal(); @SuppressWarnings("serial") - private static final Annotation TAME_LITERAL = new AnnotationLiteral() { - }; + private static final Annotation TAME_LITERAL = new Tame.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tame.java index 2970934dc0..70a51d1107 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/AsAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/AsAnimal.java index db7defb029..50c8e6c195 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/AsAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/AsAnimal.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface AsAnimal { - + class Literal extends AnnotationLiteral implements AsAnimal { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Foo.java index e57f33c5c1..e8caeebc9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Foo.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Foo { - + class Literal extends AnnotationLiteral implements Foo { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Pet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Pet.java index e530ec2a78..51c7b9a72e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Pet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Pet.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Pet { - + class Literal extends AnnotationLiteral implements Pet { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java index 405f62c13b..75e721f006 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java @@ -58,14 +58,10 @@ @SpecVersion(spec = "cdi", version = "2.0") public class ProducerFieldDefinitionTest extends AbstractTest { - private static final Annotation TAME_LITERAL = new AnnotationLiteral() { - }; - private static final Annotation PET_LITERAL = new AnnotationLiteral() { - }; - private static final Annotation FOO_LITERAL = new AnnotationLiteral() { - }; - private static final Annotation STATIC_LITERAL = new AnnotationLiteral() { - }; + private static final Annotation TAME_LITERAL = new Tame.Literal(); + private static final Annotation PET_LITERAL = new Pet.Literal(); + private static final Annotation FOO_LITERAL = new Foo.Literal(); + private static final Annotation STATIC_LITERAL = new Static.Literal(); @Deployment public static WebArchive createTestArchive() { @@ -117,8 +113,7 @@ public void testApiTypeForClassReturn() { @Test @SpecAssertion(section = PRODUCER_FIELD_TYPES, id = "a") public void testApiTypeForInterfaceReturn() { - Set> animalBeans = getBeans(Animal.class, new AnnotationLiteral() { - }); + Set> animalBeans = getBeans(Animal.class, new AsAnimal.Literal()); assert animalBeans.size() == 1; Bean animalModel = animalBeans.iterator().next(); assert animalModel.getTypes().size() == 2; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Static.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Static.java index b63c741f58..f97bdf5475 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Static.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Static.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Static { - + class Literal extends AnnotationLiteral implements Static { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tame.java index 0e2685ea39..075ee0e8f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Broken.java index 55c7f181be..1de7c4e389 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Broken.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Broken { - + class Literal extends AnnotationLiteral implements Broken { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Null.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Null.java index 65a878689e..6629da1821 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Null.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Null.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Null { - + class Literal extends AnnotationLiteral implements Null { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java index 585d0c8901..20d3b50d11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java @@ -40,14 +40,11 @@ public class ProducerFieldLifecycleTest extends AbstractTest { @SuppressWarnings("serial") - private AnnotationLiteral NULL_LITERAL = new AnnotationLiteral() { - }; + private AnnotationLiteral NULL_LITERAL = new Null.Literal(); @SuppressWarnings("serial") - private AnnotationLiteral BROKEN_LITERAL = new AnnotationLiteral() { - }; + private AnnotationLiteral BROKEN_LITERAL = new Broken.Literal(); @SuppressWarnings("serial") - private AnnotationLiteral TAME_LITERAL = new AnnotationLiteral() { - }; + private AnnotationLiteral TAME_LITERAL = new Tame.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Tame.java index 4e61dec6dd..7eeb4a7e1b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Deadliest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Deadliest.java index 19c0c5e196..f82059f432 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Deadliest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Deadliest.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Deadliest { - + class Literal extends AnnotationLiteral implements Deadliest { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Number.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Number.java index 5d85c4c94c..ddf53bfa9f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Number.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Number.java @@ -9,11 +9,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Number { - + class Literal extends AnnotationLiteral implements Number { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java index 32abf83752..86516383a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java @@ -64,14 +64,10 @@ @SpecVersion(spec = "cdi", version = "2.0") public class ProducerMethodDefinitionTest extends AbstractTest { - private static final Annotation TAME_LITERAL = new AnnotationLiteral() { - }; - private static final Annotation DEADLIEST_LITERAL = new AnnotationLiteral() { - }; - private static final Annotation NUMBER_LITERAL = new AnnotationLiteral() { - }; - private static final Annotation YUMMY_LITERAL = new AnnotationLiteral() { - }; + private static final Annotation TAME_LITERAL = new Tame.Literal(); + private static final Annotation DEADLIEST_LITERAL = new Deadliest.Literal(); + private static final Annotation NUMBER_LITERAL = new Number.Literal(); + private static final Annotation YUMMY_LITERAL = new Yummy.Literal(); @Deployment public static WebArchive createTestArchive() { @@ -233,10 +229,8 @@ public void testStereotypeSpecifiesScope() throws Exception { @Test @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "da"), @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "dg") }) public void testNonStaticProducerMethodNotInherited() { - assertEquals(getBeans(Apple.class, new AnnotationLiteral() { - }).size(), 1); - assertEquals(getContextualReference(Apple.class, new AnnotationLiteral() { - }).getTree().getClass(), AppleTree.class); + assertEquals(getBeans(Apple.class, new Yummy.Literal()).size(), 1); + assertEquals(getContextualReference(Apple.class, new Yummy.Literal()).getTree().getClass(), AppleTree.class); } /** @@ -265,8 +259,7 @@ public void testDependentProducerReturnsNullValue() { @Test(expectedExceptions = { IllegalProductException.class }) @SpecAssertion(section = PRODUCER_METHOD, id = "f") public void testNonDependentProducerReturnsNullValue() { - getContextualReference(Pollen.class, new AnnotationLiteral() { - }).ping(); + getContextualReference(Pollen.class, new Yummy.Literal()).ping(); fail("IllegalProductException not thrown"); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Tame.java index 52e6dfa115..4f502ab9cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Yummy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Yummy.java index 0d605f86dd..c6d27bb7ab 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Yummy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Yummy.java @@ -22,6 +22,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; import java.lang.annotation.Documented; @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Yummy { - + class Literal extends AnnotationLiteral implements Yummy { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Crazy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Crazy.java index 09bb87f627..47d2a8fa1a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Crazy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Crazy.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Crazy { - + class Literal extends AnnotationLiteral implements Crazy { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Funny.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Funny.java index 78cce456f6..cba11ec4d9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Funny.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Funny.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Funny { - + class Literal extends AnnotationLiteral implements Funny { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/ProducerMethodWithDefaultNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/ProducerMethodWithDefaultNameTest.java index 89db03f043..06aeb1225e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/ProducerMethodWithDefaultNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/ProducerMethodWithDefaultNameTest.java @@ -52,8 +52,7 @@ public static WebArchive createTestArchive() { @SpecAssertion(section = PRODUCER_METHOD_NAME, id = "a") public void testMethodName() { String name = "findTerry"; - Bean terry = getUniqueBean(Bug.class, new AnnotationLiteral() { - }); + Bean terry = getUniqueBean(Bug.class, new Crazy.Literal()); assertEquals(terry.getName(), name); } @@ -69,8 +68,7 @@ public void testJavaBeansPropertyName() { @SpecAssertions({ @SpecAssertion(section = NAMED_STEREOTYPE, id = "aa"), @SpecAssertion(section = NAMED_STEREOTYPE, id = "ab") }) public void testProducerMethodQualifiers() { String name = "produceJohn"; - Bean john = getUniqueBean(Bug.class, new AnnotationLiteral() { - }); + Bean john = getUniqueBean(Bug.class, new Funny.Literal()); assertEquals(john.getName(), name); assertTrue(annotationSetMatches(john.getQualifiers(), Any.Literal.INSTANCE, Default.Literal.INSTANCE)); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Fail.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Fail.java index f5e21a4380..a50a954e84 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Fail.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Fail.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Fail { - + class Literal extends AnnotationLiteral implements Fail { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FirstBorn.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FirstBorn.java index ebe0b2cc4a..697ba3beed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FirstBorn.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FirstBorn.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface FirstBorn { - + class Literal extends AnnotationLiteral implements FirstBorn { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Null.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Null.java index 8ce4de5c18..34433d3bd2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Null.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Null.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Null { - + class Literal extends AnnotationLiteral implements Null { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Pet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Pet.java index 240b9802be..25eda3d7ef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Pet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Pet.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Pet { - + class Literal extends AnnotationLiteral implements Pet { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java index 9dd2d343dd..ecff732ccc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java @@ -42,14 +42,10 @@ */ @SpecVersion(spec = "cdi", version = "2.0") public class ProducerMethodLifecycleTest extends AbstractTest { - private AnnotationLiteral PET_LITERAL = new AnnotationLiteral() { - }; - private AnnotationLiteral FIRST_BORN_LITERAL = new AnnotationLiteral() { - }; - private AnnotationLiteral FAIL_LITERAL = new AnnotationLiteral() { - }; - private AnnotationLiteral NULL_LITERAL = new AnnotationLiteral() { - }; + private AnnotationLiteral PET_LITERAL = new Pet.Literal(); + private AnnotationLiteral FIRST_BORN_LITERAL = new FirstBorn.Literal(); + private AnnotationLiteral FAIL_LITERAL = new Fail.Literal(); + private AnnotationLiteral NULL_LITERAL = new Null.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Atomic.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Atomic.java index 21bf6770ac..0d43aba11f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Atomic.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Atomic.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -32,5 +33,6 @@ @MissileBinding @InterceptorBinding public @interface Atomic { - + class Literal extends AnnotationLiteral implements Atomic { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java index 4eeda6e534..3e7b76995f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/InterceptorDefinitionTest.java @@ -65,17 +65,13 @@ public class InterceptorDefinitionTest extends AbstractTest { private static final Transactional.TransactionalLiteral TRANSACTIONAL_LITERAL = new Transactional.TransactionalLiteral("") { }; - private static final AnnotationLiteral SECURE_LITERAL = new AnnotationLiteral() { - }; + private static final AnnotationLiteral SECURE_LITERAL = new Secure.Literal(); - private static final AnnotationLiteral MISSILE_LITERAL = new AnnotationLiteral() { - }; + private static final AnnotationLiteral MISSILE_LITERAL = new MissileBinding.Literal(); - private static final AnnotationLiteral LOGGED_LITERAL = new AnnotationLiteral() { - }; + private static final AnnotationLiteral LOGGED_LITERAL = new Logged.Literal(); - private static final AnnotationLiteral ATOMIC_LITERAL = new AnnotationLiteral() { - }; + private static final AnnotationLiteral ATOMIC_LITERAL = new Atomic.Literal(); @Deployment public static WebArchive createTestArchive() { @@ -176,8 +172,7 @@ public void testNoBindingTypesToResolveInterceptorsFails() { @Test(expectedExceptions = { IllegalArgumentException.class }) @SpecAssertions({ @SpecAssertion(section = BM_INTERCEPTOR_RESOLUTION, id = "d") }) public void testNonBindingTypeToResolveInterceptorsFails() { - Annotation nonBinding = new AnnotationLiteral() { - }; + Annotation nonBinding = new NonBindingType.Literal(); getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, nonBinding); } @@ -232,8 +227,7 @@ private Interceptor getTransactionalInterceptor() { } private List> getLoggedInterceptors() { - return getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral() { - }); + return getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, new Logged.Literal()); } private Set getInterfacesImplemented(Class clazz) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Logged.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Logged.java index 60a95e1834..dcd689c25b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Logged.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Logged.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -31,5 +32,6 @@ @Documented @InterceptorBinding public @interface Logged { - + class Literal extends AnnotationLiteral implements Logged { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileBinding.java index e95c611cc6..a07e276a56 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -31,5 +32,6 @@ @Documented @InterceptorBinding public @interface MissileBinding { - + class Literal extends AnnotationLiteral implements MissileBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NonBindingType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NonBindingType.java index 8b77071655..1599692860 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NonBindingType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NonBindingType.java @@ -16,6 +16,8 @@ */ package org.jboss.cdi.tck.tests.interceptors.definition; +import jakarta.enterprise.util.AnnotationLiteral; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; @@ -30,5 +32,6 @@ @Retention(RUNTIME) @Documented public @interface NonBindingType { - + class Literal extends AnnotationLiteral implements NonBindingType { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Secure.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Secure.java index fe66dec5a5..b310cf5d1e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Secure.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Secure.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -31,5 +32,6 @@ @Documented @InterceptorBinding public @interface Secure { - + class Literal extends AnnotationLiteral implements Secure { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/DynamicLookupTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/DynamicLookupTest.java index e05289f23f..ad9caf6f20 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/DynamicLookupTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/DynamicLookupTest.java @@ -90,8 +90,7 @@ public void testDuplicateBindingsThrowsException() { public void testNonBindingThrowsException() { try { ObtainsInstanceBean injectionPoint = getContextualReference(ObtainsInstanceBean.class); - injectionPoint.getAnyPaymentProcessor().select(new AnnotationLiteral() { - }); + injectionPoint.getAnyPaymentProcessor().select(new NonBinding.Literal()); } catch (Throwable t) { assertTrue(isThrowablePresent(IllegalArgumentException.class, t)); return; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/NonBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/NonBinding.java index 0f5bc1dd8a..1796d9b3a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/NonBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/NonBinding.java @@ -16,6 +16,8 @@ */ package org.jboss.cdi.tck.tests.lookup.dynamic; +import jakarta.enterprise.util.AnnotationLiteral; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; @@ -30,5 +32,6 @@ @Retention(RUNTIME) @Documented public @interface NonBinding { - + class Literal extends AnnotationLiteral implements NonBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java index b11d8e4fc5..5be54c3939 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java @@ -44,8 +44,7 @@ public class BuiltinInstanceTest extends AbstractTest { @SuppressWarnings("serial") - private static final AnnotationLiteral farmBasedLiteral = new AnnotationLiteral() { - }; + private static final AnnotationLiteral farmBasedLiteral = new FarmBased.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/FarmBased.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/FarmBased.java index 274fad7487..c6fea71049 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/FarmBased.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/FarmBased.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface FarmBased { - + class Literal extends AnnotationLiteral implements FarmBased { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Bar.java index a4f7ef6f22..6688287488 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Bar.java @@ -63,8 +63,7 @@ public Foo getTypeNiceFoo() { @SuppressWarnings("serial") public Foo getQualifierNiceFoo() { - return fooInstance.select(new AnnotationLiteral() { - }).get(); + return fooInstance.select(new Nice.Literal()).get(); } public Foo getConstructorInjectionFoo() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/DynamicInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/DynamicInjectionPointTest.java index b60d819112..0e64465a49 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/DynamicInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/DynamicInjectionPointTest.java @@ -84,8 +84,7 @@ public void testInjectionPointGetQualifiers() { Set niceFooQualifiers = bar.getQualifierNiceFoo().getInjectionPoint().getQualifiers(); annotationSetMatches(fooQualifiers, Any.Literal.INSTANCE, Default.Literal.INSTANCE); - annotationSetMatches(niceFooQualifiers, Any.Literal.INSTANCE, new AnnotationLiteral() { - }); + annotationSetMatches(niceFooQualifiers, Any.Literal.INSTANCE, new Nice.Literal()); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Nice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Nice.java index e439f827ec..1f1607d824 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Nice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Nice.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Qualifier @@ -33,5 +34,6 @@ @Retention(RUNTIME) @Documented public @interface Nice { - + class Literal extends AnnotationLiteral implements Nice { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Max.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Max.java index 1d859d2b07..64dffa7dcf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Max.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Max.java @@ -25,11 +25,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Max { - + class Literal extends AnnotationLiteral implements Max { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Min.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Min.java index 861ec7a5ad..f07796ac9a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Min.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Min.java @@ -25,11 +25,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Min { - + class Literal extends AnnotationLiteral implements Min { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Number.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Number.java index 2005e52d59..aeb400ebd5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Number.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Number.java @@ -25,11 +25,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Number { - + class Literal extends AnnotationLiteral implements Number { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java index 62dc26aff6..b1a37b557e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java @@ -57,12 +57,9 @@ public class ResolutionByTypeTest extends AbstractTest { }; private static final TypeLiteral> AFRICAN_CAT = new TypeLiteral>() { }; - private static final Annotation TAME = new AnnotationLiteral() { - }; - private static final Annotation WILD = new AnnotationLiteral() { - }; - private static final Annotation NUMBER = new AnnotationLiteral() { - }; + private static final Annotation TAME = new Tame.Literal(); + private static final Annotation WILD = new Wild.Literal(); + private static final Annotation NUMBER = new Number.Literal(); @Deployment public static WebArchive createTestArchive() { @@ -83,13 +80,11 @@ public void testDefaultBindingTypeAssumed() throws Exception { @SpecAssertion(section = MULTIPLE_QUALIFIERS, id = "a"), @SpecAssertion(section = MULTIPLE_QUALIFIERS, id = "d") }) public void testAllQualifiersSpecifiedForResolutionMustAppearOnBean() { - Set> animalBeans = getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral() { - }); + Set> animalBeans = getBeans(Animal.class, new ChunkyLiteral(), new Whitefish.Literal()); assertEquals(animalBeans.size(), 1); assertTrue(animalBeans.iterator().next().getTypes().contains(Cod.class)); - Set> scottishFishBeans = getBeans(ScottishFish.class, new AnnotationLiteral() { - }); + Set> scottishFishBeans = getBeans(ScottishFish.class, new Whitefish.Literal()); assertEquals(scottishFishBeans.size(), 2); for (Bean bean : scottishFishBeans) { @@ -124,10 +119,8 @@ public void testResolveByTypeWithPrimitives() { assertEquals(getBeans(Double.class, NUMBER).size(), 2); assertEquals(getBeans(double.class, NUMBER).size(), 2); - Double min = getContextualReference(Double.class, new AnnotationLiteral() { - }); - double max = getContextualReference(double.class, new AnnotationLiteral() { - }); + Double min = getContextualReference(Double.class, new Min.Literal()); + double max = getContextualReference(double.class, new Max.Literal()); assertEquals(min, Double.valueOf(NumberProducer.min)); assertEquals(Double.valueOf(max), NumberProducer.max); @@ -146,8 +139,7 @@ public boolean veryExpensive() { return true; } - }, new AnnotationLiteral() { - }); + }, new Whitefish.Literal()); assertEquals(beans.size(), 2); Set classes = new HashSet(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tame.java index 5ae6b6ae2a..9662585587 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tame.java @@ -25,11 +25,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Whitefish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Whitefish.java index dd2bb22153..658ba5e04c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Whitefish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Whitefish.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Whitefish { - + class Literal extends AnnotationLiteral implements Whitefish { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Wild.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Wild.java index b84ce79374..18e9aa168e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Wild.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Wild.java @@ -25,11 +25,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Wild { - + class Literal extends AnnotationLiteral implements Wild { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/VetoedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/VetoedTest.java index 8746a849f8..8dc1b4bdc4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/VetoedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/VetoedTest.java @@ -61,8 +61,7 @@ public void testClassLevelVeto() { public void testPackageLevelVeto() { assertEquals(getCurrentManager().getBeans(Piranha.class, Any.Literal.INSTANCE).size(), 0); assertEquals(getCurrentManager().getBeans(Shark.class, Any.Literal.INSTANCE).size(), 1); - assertEquals(getCurrentManager().getBeans(Shark.class, new AnnotationLiteral() { - }).size(), 1); + assertEquals(getCurrentManager().getBeans(Shark.class, new Fishy.Literal()).size(), 1); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Fishy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Fishy.java index 86763f7a5f..eac9766de3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Fishy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Fishy.java @@ -22,6 +22,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; import java.lang.annotation.Documented; @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Fishy { - + class Literal extends AnnotationLiteral implements Fishy { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/EnterpriseInterceptorBindingResolutionTest.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/EnterpriseInterceptorBindingResolutionTest.java index 791fb77f29..471040bded 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/EnterpriseInterceptorBindingResolutionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/EnterpriseInterceptorBindingResolutionTest.java @@ -71,12 +71,12 @@ public void testBusinessMethodInterceptorBindings(MessageService messageService, // Test interceptor is resolved (note non-binding member of BallBinding) assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, - new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new BallBindingLiteral(true, true)).size(), 1); + new MessageBinding.Literal(), + new LoggedBinding.Literal(), + new TransactionalBinding.Literal(), + new PingBinding.Literal(), + new PongBinding.Literal(), + new BallBindingLiteral(true, true)).size(), 1); // Test the set of interceptor bindings assertNotNull(messageService); @@ -115,15 +115,15 @@ public void testLifecycleInterceptorBindings() throws Exception { // Test interceptor is resolved (note non-binding member of BallBinding) assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.POST_CONSTRUCT, - new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new BasketBindingLiteral(true, true)).size(), 1); + new MessageBinding.Literal(), + new LoggedBinding.Literal(), + new TransactionalBinding.Literal(), + new BasketBindingLiteral(true, true)).size(), 1); assertEquals( - getCurrentManager().resolveInterceptors(InterceptionType.PRE_DESTROY, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new AnnotationLiteral() { - }, new BasketBindingLiteral(true, true)).size(), 1); + getCurrentManager().resolveInterceptors(InterceptionType.PRE_DESTROY, new MessageBinding.Literal(), + new LoggedBinding.Literal(), + new TransactionalBinding.Literal(), + new BasketBindingLiteral(true, true)).size(), 1); // Test the set of interceptor bindings ComplicatedLifecycleInterceptor.reset(); diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/LoggedBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/LoggedBinding.java index cc29c4e5c1..5633596787 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/LoggedBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/LoggedBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) @@ -32,4 +33,6 @@ @Documented @InterceptorBinding public @interface LoggedBinding { + class Literal extends AnnotationLiteral implements LoggedBinding { + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/MessageBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/MessageBinding.java index 1953d7f149..5456164186 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/MessageBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/MessageBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) @@ -32,4 +33,6 @@ @Documented @InterceptorBinding public @interface MessageBinding { + class Literal extends AnnotationLiteral implements MessageBinding { + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PingBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PingBinding.java index 118b00baf2..2494aac359 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PingBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PingBinding.java @@ -25,6 +25,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -34,4 +35,6 @@ @Documented @InterceptorBinding public @interface PingBinding { + class Literal extends AnnotationLiteral implements PingBinding { + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PongBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PongBinding.java index 9cb646c3c7..fd8863ca54 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PongBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/PongBinding.java @@ -25,6 +25,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @@ -34,4 +35,6 @@ @Documented @InterceptorBinding public @interface PongBinding { + class Literal extends AnnotationLiteral implements PongBinding { + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/TransactionalBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/TransactionalBinding.java index c87429cb17..3f8a2a6842 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/TransactionalBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/TransactionalBinding.java @@ -24,6 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) @@ -32,4 +33,6 @@ @Documented @InterceptorBinding public @interface TransactionalBinding { + class Literal extends AnnotationLiteral implements TransactionalBinding { + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseProduction.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseProduction.java index c18c0f0b98..f4d18b93e0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseProduction.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseProduction.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface DatabaseProduction { + class Literal extends AnnotationLiteral implements DatabaseProduction { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseTest.java index ea04f35723..9cea2bcbad 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/DatabaseTest.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface DatabaseTest { + class Literal extends AnnotationLiteral implements DatabaseTest { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java index 1fe9da22e4..03d4e596f8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/ResourceAlternativeAvailabilityTest.java @@ -61,10 +61,8 @@ public static WebArchive createTestArchive() { @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "cc") public void testResourceAvailability() { - AnnotationLiteral testLiteral = new AnnotationLiteral() { - }; - AnnotationLiteral productionLiteral = new AnnotationLiteral() { - }; + AnnotationLiteral testLiteral = new DatabaseTest.Literal(); + AnnotationLiteral productionLiteral = new DatabaseProduction.Literal(); Set> beans = getBeans(EntityManager.class, testLiteral); assertEquals(beans.size(), 1); beans = getBeans(EntityManager.class, productionLiteral); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/ApplicationContextDisposerTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/ApplicationContextDisposerTest.java index 6079519c2e..74fd95621a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/ApplicationContextDisposerTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/ApplicationContextDisposerTest.java @@ -57,8 +57,7 @@ public static WebArchive createTestArchive() { public void testApplicationContextActiveDuringDispose() { logger.log("Injected forest: {0}", forest.toString()); @SuppressWarnings("serial") - Bean bean = getUniqueBean(Mushroom.class, new AnnotationLiteral() { - }); + Bean bean = getUniqueBean(Mushroom.class, new Edible.Literal()); CreationalContext ctx = getCurrentManager().createCreationalContext(bean); Mushroom mushroom = bean.create(ctx); assertEquals(mushroom.getName(), "Boletus"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/Edible.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/Edible.java index 87fe204ded..45fb1d6950 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/Edible.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/disposer/Edible.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Edible { - + class Literal extends AnnotationLiteral implements Edible { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/Mock.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/Mock.java index 8d5f42facb..ce8c8a87a0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/Mock.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/Mock.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface Mock { + class Literal extends AnnotationLiteral implements Mock { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/SessionBeanTypesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/SessionBeanTypesTest.java index 946c9854a8..766b6714f1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/SessionBeanTypesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/SessionBeanTypesTest.java @@ -99,8 +99,7 @@ public void testSessionBeanWithBothLocalInterfaceAndNoInterfaceView() { @SpecAssertion(section = SESSION_BEAN_TYPES, id = "ba") public void testSessionBeanExtendingSessionBeanWithLocalClientView() { // no-interface view - Bean loginBean = getUniqueBean(MockLoginActionBean.class, new AnnotationLiteral() { - }); + Bean loginBean = getUniqueBean(MockLoginActionBean.class, new Mock.Literal()); assertNotNull(loginBean); // MockLoginActionBean, LoginActionBean, Object assertEquals(loginBean.getTypes().size(), 3); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtension.java index e4d3cb3ecc..b6b040921b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtension.java @@ -51,8 +51,7 @@ public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, final BeanM methods = new HashSet>(); for (AnnotatedMethod method : super.getMethods()) { if ("value".equals(method.getJavaMember().getName())) { - methods.add(new AnnotatedMethodWrapper((AnnotatedMethod) method, this, true, new AnnotationLiteral() { - })); + methods.add(new AnnotatedMethodWrapper((AnnotatedMethod) method, this, true, new Nonbinding.Literal())); } else { methods.add(new AnnotatedMethodWrapper((AnnotatedMethod) method, this, true)); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java index 4c6321aabf..6df597d0ed 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java @@ -140,8 +140,7 @@ public void testBeanWithStereotype() { @Test @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "be") public void testBeanWithQualifiers() { - Annotation tame = new AnnotationLiteral() { - }; + Annotation tame = new Tame.Literal(); Bean apeBean = getBeans(ApeLocal.class, tame).iterator().next(); assert apeBean.getQualifiers().contains(tame); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Tame.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Tame.java index 5fa170be23..ec92894222 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Tame.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Tame.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/RemoteInterfaceNotInAPITypesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/RemoteInterfaceNotInAPITypesTest.java index 07fda9e1eb..c047795073 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/RemoteInterfaceNotInAPITypesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/RemoteInterfaceNotInAPITypesTest.java @@ -51,8 +51,7 @@ public static WebArchive createTestArchive() { @SpecAssertion(section = SESSION_BEAN_TYPES, id = "c"), @SpecAssertion(section = SESSION_BEAN_TYPES, id = "aa") }) public void testRemoteInterfacesAreNotInAPITypes() { // only remote view - Bean collieBean = getUniqueBean(Object.class, new AnnotationLiteral() { - }); + Bean collieBean = getUniqueBean(Object.class, new Tame.Literal()); assertNotNull(collieBean); assertTypeSetMatches(collieBean.getTypes(), Object.class); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Tame.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Tame.java index c8c011555a..2e0e6f2640 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Tame.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Tame.java @@ -10,6 +10,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -17,5 +18,6 @@ @Documented @Qualifier public @interface Tame { - + class Literal extends AnnotationLiteral implements Tame { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java index cc0e8d985c..4eadb7f25b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java @@ -73,15 +73,13 @@ public void testCreateSFSB() throws Exception { GrossStadt frankfurt = getContextualReference(GrossStadt.class); Bean stadtBean = getBeans(KleinStadt.class).iterator().next(); assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; - KleinStadt stadtInstance = getContextualReference(KleinStadt.class, new AnnotationLiteral() { - }); + KleinStadt stadtInstance = getContextualReference(KleinStadt.class, new Important.Literal()); assert stadtInstance != null : "Expected instance to be created by container"; assert frankfurt.isKleinStadtCreated() : "PostConstruct should be invoked when bean instance is created"; frankfurt.resetCreatedFlags(); // Create a second one to make sure create always does create a new session bean - KleinStadt anotherStadtInstance = getContextualReference(KleinStadt.class, new AnnotationLiteral() { - }); + KleinStadt anotherStadtInstance = getContextualReference(KleinStadt.class, new Important.Literal()); assert anotherStadtInstance != null : "Expected second instance of session bean"; assert frankfurt.isKleinStadtCreated(); assert anotherStadtInstance != stadtInstance : "create() should not return same bean as before"; @@ -99,8 +97,7 @@ public void testCreateSFSB() throws Exception { @SpecAssertions({ @SpecAssertion(section = PASSIVATION_CAPABLE_DEPENDENCY_EE, id = "ac") }) public void testSerializeSFSB() throws Exception { - KleinStadt stadtInstance = getContextualReference(KleinStadt.class, new AnnotationLiteral() { - }); + KleinStadt stadtInstance = getContextualReference(KleinStadt.class, new Important.Literal()); byte[] bytes = passivate(stadtInstance); Object object = activate(bytes); @@ -130,8 +127,7 @@ public void testDestroyRemovesSFSB() throws Exception { @Test(groups = INTEGRATION) @SpecAssertions({ @SpecAssertion(section = STATELESS_LIFECYCLE, id = "c"), @SpecAssertion(section = SESSION_BEAN_EJB_REMOVE_METHOD, id = "dba") }) public void testRemovedEjbIgnored() { - KleinStadt stadtInstance = getContextualReference(KleinStadt.class, new AnnotationLiteral() { - }); + KleinStadt stadtInstance = getContextualReference(KleinStadt.class, new Important.Literal()); assert stadtInstance != null : "Expected instance to be created by container"; stadtInstance.setName("Kassel-Wilhelmshoehe"); stadtInstance.zustandVergessen(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Important.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Important.java index 7ea462b358..a4de8a5903 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Important.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Important.java @@ -27,6 +27,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; /** @@ -38,4 +39,6 @@ @Qualifier @Inherited public @interface Important { + class Literal extends AnnotationLiteral implements Important { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java index 31c0485aae..da79c21e60 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java @@ -42,10 +42,8 @@ public static WebArchive createTestArchive() { @Test(groups = INTEGRATION) @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "a"), @SpecAssertion(section = PRODUCER_FIELD_EE, id = "a") }) public void testStaticProducerField() { - assert getContextualReference(Egg.class, new AnnotationLiteral() { - }) != null; - assert getContextualReference(Egg.class, new AnnotationLiteral() { - }).getSize() == Chicken.SIZE; + assert getContextualReference(Egg.class, new Foo.Literal()) != null; + assert getContextualReference(Egg.class, new Foo.Literal()).getSize() == Chicken.SIZE; } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Foo.java index 543e24c95b..99aca074af 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Foo.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Foo { - + class Literal extends AnnotationLiteral implements Foo { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java index d3941f35eb..0d42e883c0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java @@ -46,26 +46,21 @@ public static WebArchive createTestArchive() { @Test(groups = INTEGRATION, expectedExceptions = UnsatisfiedResolutionException.class) @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE_EE, id = "dd") public void testNonStaticProducerMethodNotInheritedBySpecializingSubclass() { - assertEquals(getBeans(Egg.class, new AnnotationLiteral() { - }).size(), 0); - getContextualReference(Egg.class, new AnnotationLiteral() { - }).getMother(); + assertEquals(getBeans(Egg.class, new Yummy.Literal()).size(), 0); + getContextualReference(Egg.class, new Yummy.Literal()).getMother(); } @Test(groups = INTEGRATION) @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE_EE, id = "dd") public void testNonStaticProducerMethodNotInherited() { - assertEquals(getBeans(Apple.class, new AnnotationLiteral() { - }).size(), 1); - assertTrue(getContextualReference(Apple.class, new AnnotationLiteral() { - }).getTree() instanceof AppleTree); + assertEquals(getBeans(Apple.class, new Yummy.Literal()).size(), 1); + assertTrue(getContextualReference(Apple.class, new Yummy.Literal()).getTree() instanceof AppleTree); } @Test(groups = INTEGRATION) @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE_EE, id = "dj") public void testNonStaticProducerMethodNotIndirectlyInherited() { - Set> beans = getBeans(Pear.class, new AnnotationLiteral() { - }); + Set> beans = getBeans(Pear.class, new Yummy.Literal()); assertEquals(beans.size(), 2); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java index ef0ea4b085..92ab8dbd8f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Yummy.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Yummy { - + class Literal extends AnnotationLiteral implements Yummy { + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java index 323d503bc4..823eaef82f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java @@ -74,8 +74,7 @@ public void testPassivationOfEjbs() throws Exception { @SpecAssertions({ @SpecAssertion(section = RESOURCE_TYPES, id = "ad") }) public void testResourceBeanTypes() { @SuppressWarnings("serial") - Bean beanRemote = getBeans(BeanRemote.class, new AnnotationLiteral() { - }).iterator().next(); + Bean beanRemote = getBeans(BeanRemote.class, new Lazy.Literal()).iterator().next(); assert beanRemote.getTypes().size() == 3; assert typeSetMatches(beanRemote.getTypes(), BeanRemote.class, Object.class, AnotherInterface.class); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Lazy.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Lazy.java index a39abf4e79..ffa25935e7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Lazy.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Lazy.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Lazy { - + class Literal extends AnnotationLiteral implements Lazy { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java index 904df422f0..f5f93528ac 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java @@ -67,8 +67,7 @@ public void testInjectionOfEnv() { @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "o") }) public void testProduceEnvProxy() { @SuppressWarnings("serial") - Bean greetingEnvBean = getBeans(String.class, new AnnotationLiteral() { - }).iterator().next(); + Bean greetingEnvBean = getBeans(String.class, new Greeting.Literal()).iterator().next(); CreationalContext greetingEnvCc = getCurrentManager().createCreationalContext(greetingEnvBean); String greeting = greetingEnvBean.create(greetingEnvCc); assert greeting != null; @@ -79,8 +78,7 @@ public void testProduceEnvProxy() { @SpecAssertions({ @SpecAssertion(section = RESOURCE_TYPES, id = "aa") }) public void testResourceBeanTypes() { @SuppressWarnings("serial") - Bean check = getBeans(Boolean.class, new AnnotationLiteral() { - }).iterator().next(); + Bean check = getBeans(Boolean.class, new Greeting.Literal()).iterator().next(); // Build the expected types from the JVM Boolean.class to avoid issues as the java.lang types evolve ArrayList> classes = new ArrayList<>(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/Greeting.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/Greeting.java index c5c74d9324..1d426a0ae3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/Greeting.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/Greeting.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface Greeting { + class Literal extends AnnotationLiteral implements Greeting { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/Database.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/Database.java index 071dfaa74a..a56c2662eb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/Database.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/Database.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface Database { + class Literal extends AnnotationLiteral implements Database { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java index 2503640cdf..4df7f48398 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java @@ -100,8 +100,7 @@ public void testPassivationOfPersistenceUnit() throws Exception { @Test @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "hh"), @SpecAssertion(section = RESOURCE_TYPES, id = "ab") }) public void testBeanTypesAndBindingTypesOfPersistenceContext() { - Bean manager = getBeans(EntityManager.class, new AnnotationLiteral() { - }).iterator().next(); + Bean manager = getBeans(EntityManager.class, new Database.Literal()).iterator().next(); assert manager.getTypes().size() == 3; assert typeSetMatches(manager.getTypes(), EntityManager.class, Object.class, AutoCloseable.class); assert manager.getQualifiers().size() == 2; @@ -111,8 +110,7 @@ public void testBeanTypesAndBindingTypesOfPersistenceContext() { @Test @SpecAssertions({ @SpecAssertion(section = RESOURCE_TYPES, id = "ac") }) public void testBeanTypesOfPersistenceUnit() { - Bean factory = getBeans(EntityManagerFactory.class, new AnnotationLiteral() { - }).iterator().next(); + Bean factory = getBeans(EntityManagerFactory.class, new Database.Literal()).iterator().next(); assert factory.getTypes().size() == 3; assert typeSetMatches(factory.getTypes(), EntityManagerFactory.class, Object.class, AutoCloseable.class); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/Another.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/Another.java index dc9d8a46e0..4d4e1814ab 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/Another.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/Another.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,4 +34,6 @@ @Documented @Qualifier public @interface Another { + class Literal extends AnnotationLiteral implements Another { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java index 5a1935dee1..3d05ee3f20 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java @@ -58,8 +58,7 @@ public void testInjectionOfResource() { @SpecAssertions({ @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "la"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "ma"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "o") }) public void testProduceResourceProxy() { - Bean beanManagerBean = getBeans(BeanManager.class, new AnnotationLiteral() { - }).iterator().next(); + Bean beanManagerBean = getBeans(BeanManager.class, new Another.Literal()).iterator().next(); CreationalContext beanManagerCc = getCurrentManager().createCreationalContext(beanManagerBean); BeanManager beanManager = beanManagerBean.create(beanManagerCc); assert beanManager != null; @@ -78,8 +77,7 @@ public void testPassivatingResource() throws Exception { @Test @SpecAssertions({ @SpecAssertion(section = RESOURCE_TYPES, id = "aa") }) public void testResourceBeanTypes() { - Bean beanRemote = getBeans(BeanManager.class, new AnnotationLiteral() { - }).iterator().next(); + Bean beanRemote = getBeans(BeanManager.class, new Another.Literal()).iterator().next(); assert beanRemote.getTypes().size() == 3; assert beanRemote.getTypes().contains(BeanManager.class); assert beanRemote.getTypes().contains(BeanContainer.class); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java index 9ceca197ba..4ccf33cca2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java @@ -44,8 +44,7 @@ public class EnterpriseBeanSpecializationTest extends AbstractTest { @SuppressWarnings("serial") - private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral() { - }; + private static Annotation LANDOWNER_LITERAL = new Landowner.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Landowner.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Landowner.java index 7de861b191..d9886cc29e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Landowner.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Landowner.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Landowner { - + class Literal extends AnnotationLiteral implements Landowner { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/EnterpriseProducerMethodSpecializationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/EnterpriseProducerMethodSpecializationTest.java index 646bc23d9c..2c796104a9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/EnterpriseProducerMethodSpecializationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/EnterpriseProducerMethodSpecializationTest.java @@ -47,11 +47,9 @@ public class EnterpriseProducerMethodSpecializationTest extends AbstractTest { @SuppressWarnings("serial") - private static Annotation EXPENSIVE_LITERAL = new AnnotationLiteral() { - }; + private static Annotation EXPENSIVE_LITERAL = new Expensive.Literal(); @SuppressWarnings("serial") - private static Annotation SPARKLY_LITERAL = new AnnotationLiteral() { - }; + private static Annotation SPARKLY_LITERAL = new Sparkly.Literal(); @Deployment public static WebArchive createTestArchive() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Expensive.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Expensive.java index 1e13ef9384..96ad89be5b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Expensive.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Expensive.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Expensive { - + class Literal extends AnnotationLiteral implements Expensive { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Sparkly.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Sparkly.java index fd5094b1ef..ad707d0678 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Sparkly.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Sparkly.java @@ -26,6 +26,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @Target({ TYPE, METHOD, PARAMETER, FIELD }) @@ -33,5 +34,6 @@ @Documented @Qualifier public @interface Sparkly { - + class Literal extends AnnotationLiteral implements Sparkly { + } }