From b1c27ad7e3b6a9555139fe9f67caadad35867b24 Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Sun, 25 Feb 2024 13:48:28 +0100 Subject: [PATCH 1/2] Apply same formatting rules as CDI API uses --- .github/workflows/ci-actions.yml | 4 +- .gitignore | 1 + pom.xml | 119 +++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml index e763fbdbc7..a6cebb8b53 100644 --- a/.github/workflows/ci-actions.yml +++ b/.github/workflows/ci-actions.yml @@ -24,7 +24,7 @@ jobs: java-version: ${{ matrix.java }} - name: "Maven install(staging)" run: | - mvn clean install -Pstaging -B -V + mvn clean install -Dno-format -Pstaging -B -V - name: "Maven install" run: | - mvn clean install -B -V javadoc:javadoc + mvn clean install -Dno-format -B -V javadoc:javadoc diff --git a/.gitignore b/.gitignore index 372bff55ea..820e607d22 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ target .settings .classpath .idea +.cache *.iml test-output diff --git a/pom.xml b/pom.xml index b0e5e79efc..3bed558050 100644 --- a/pom.xml +++ b/pom.xml @@ -105,6 +105,11 @@ 2.0.1 5.0.1 + + false + 2.23.0 + 1.9.0 + 7.9.0 2.0.0.Final @@ -287,6 +292,38 @@ maven-enforcer-plugin 3.4.1 + + net.revelc.code.formatter + formatter-maven-plugin + ${formatter.version} + + + jakarta.enterprise + cdi-ide-config + ${cdi.api.version} + + + + + .cache/formatter-maven-plugin-${formatter-maven-plugin.version} + cdi-format.xml + LF + ${format.skip} + + + + net.revelc.code + impsort-maven-plugin + ${impsort.version} + + + .cache/impsort-maven-plugin-${impsort-maven-plugin.version} + java.,javax.,jakarta.,org.,com. + * + ${format.skip} + true + + @@ -404,6 +441,88 @@ + + + + format + + false + + !no-format + + + src/main/java + + + + + + net.revelc.code.formatter + formatter-maven-plugin + + + process-sources + + format + + + + + + net.revelc.code + impsort-maven-plugin + + + sort-imports + + sort + + + + + + + + + validate + + false + + no-format + + + src/main/java + + + + + + net.revelc.code.formatter + formatter-maven-plugin + + + process-sources + + validate + + + + + + net.revelc.code + impsort-maven-plugin + + + check-imports + + check + + + + + + + From 0be0737552118ccd2977d2327c1246f7375dad5d Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Sun, 25 Feb 2024 13:51:45 +0100 Subject: [PATCH 2/2] Apply formatting rules to the codebase --- .../org/jboss/cdi/tck/api/Configuration.java | 9 +- .../java/org/jboss/cdi/tck/spi/Beans.java | 116 ++++---- .../java/org/jboss/cdi/tck/spi/Contexts.java | 148 +++++----- .../main/java/org/jboss/cdi/tck/spi/EL.java | 3 +- .../java/org/jboss/cdi/tck/extlib/Strict.java | 2 +- .../jboss/cdi/tck/extlib/StrictLiteral.java | 2 +- .../org/jboss/cdi/tck/extlib/Translator.java | 4 +- .../java/org/jboss/cdi/tck/AbstractTest.java | 6 +- .../java/org/jboss/cdi/tck/TestGroups.java | 14 +- .../jboss/cdi/tck/impl/ConfigurationImpl.java | 2 +- .../PropertiesBasedConfigurationBuilder.java | 46 ++-- .../testng/ConfigurationLoggingListener.java | 6 +- .../testng/ProgressLoggingTestListener.java | 3 +- .../SingleTestClassMethodInterceptor.java | 13 +- .../aroundConstruct/AbstractInterceptor.java | 1 - .../ConstructorInterceptionTest.java | 8 +- .../tests/bindings/broken/Bar.java | 2 +- .../tests/bindings/broken/BarBinding.java | 2 +- .../tests/bindings/broken/BarInterceptor.java | 2 +- .../tests/bindings/broken/BarStereotype.java | 2 +- .../tests/bindings/broken/BazBinding.java | 5 +- .../tests/bindings/broken/Foo.java | 2 +- .../tests/bindings/broken/FooBinding.java | 2 +- .../tests/bindings/broken/FooInterceptor.java | 2 +- .../tests/bindings/broken/FooStereotype.java | 2 +- ...typeInterceptorBindingAnnotationsTest.java | 2 +- ...tiveInterceptorBindingAnnotationsTest.java | 2 +- .../bindings/broken/NoBazInterceptor.java | 2 +- .../bindings/broken/YesBazInterceptor.java | 2 +- .../AnimalCountInterceptorBinding.java | 5 +- .../tests/bindings/members/Farm.java | 1 + .../InterceptorBindingTypeWithMemberTest.java | 6 +- .../tests/bindings/members/Plant.java | 2 +- .../bindings/members/PlantInterceptor.java | 2 +- .../members/PlantInterceptorBinding.java | 2 +- .../members/VehicleCountInterceptor.java | 2 +- .../VehicleCountInterceptorBinding.java | 2 +- .../tests/bindings/multiple/Deadly.java | 2 +- .../tests/bindings/multiple/Fast.java | 2 +- .../multiple/FastAndDeadlyMissile.java | 2 +- .../bindings/multiple/GuidedMissile.java | 2 +- .../bindings/multiple/LockInterceptor.java | 2 +- .../tests/bindings/multiple/Missile.java | 2 +- .../bindings/multiple/MissileInterceptor.java | 2 +- .../MultipleInterceptorBindingsTest.java | 1 - .../tests/bindings/multiple/Slow.java | 2 +- .../tests/bindings/multiple/SlowMissile.java | 2 +- .../tests/bindings/overriding/Aging.java | 3 +- .../InterceptorBindingOverridingTest.java | 2 +- .../tests/bindings/overriding/Pony.java | 1 + .../bindings/resolution/BallBinding.java | 2 +- .../resolution/BallBindingLiteral.java | 2 +- .../bindings/resolution/BasketBinding.java | 2 +- .../resolution/BasketBindingLiteral.java | 2 +- ...ComplicatedAroundConstructInterceptor.java | 2 +- .../resolution/ComplicatedInterceptor.java | 2 +- .../ComplicatedLifecycleInterceptor.java | 2 +- .../resolution/ConstructorBinding.java | 2 +- .../bindings/resolution/CreativeBinding.java | 2 +- .../InterceptorBindingResolutionTest.java | 18 +- .../bindings/resolution/LoggedBinding.java | 2 +- .../bindings/resolution/MachineBinding.java | 2 +- .../bindings/resolution/MessageBinding.java | 2 +- .../bindings/resolution/PingBinding.java | 2 +- .../bindings/resolution/PongBinding.java | 2 +- .../bindings/resolution/RemoteService.java | 1 - .../resolution/ServiceStereotype.java | 2 +- .../resolution/TransactionalBinding.java | 2 +- .../aroundConstruct/AlphaBinding.java | 8 +- .../aroundConstruct/AroundConstructTest.java | 8 +- .../aroundConstruct/BravoBinding.java | 8 +- .../contract/aroundConstruct/Charlie.java | 1 - .../aroundConstruct/CharlieBinding.java | 6 +- .../aroundConstruct/CharlieInterceptor1.java | 1 - .../bindings/AlphaBinding.java | 2 +- .../bindings/AroundConstructTest.java | 1 + .../AroundInvokeAccessInterceptorTest.java | 1 - .../tests/contract/aroundInvoke/Bean1.java | 2 +- .../tests/contract/aroundInvoke/Bean2.java | 2 +- .../tests/contract/aroundInvoke/Bean3.java | 2 +- .../aroundInvoke/PackagePrivateBinding.java | 10 +- .../PackagePrivateInterceptor.java | 2 +- .../contract/aroundInvoke/PrivateBinding.java | 10 +- .../aroundInvoke/PrivateInterceptor.java | 2 +- .../aroundInvoke/ProtectedBinding.java | 10 +- .../aroundInvoke/ProtectedInterceptor.java | 2 +- .../contract/aroundInvoke/SimpleBean.java | 2 +- .../aroundInvoke/bindings/Binding.java | 2 +- .../aroundInvoke/ExceptionBinding.java | 10 +- .../exceptions/aroundInvoke/Interceptor1.java | 2 +- .../exceptions/aroundInvoke/Interceptor2.java | 2 +- .../exceptions/aroundInvoke/Interceptor3.java | 2 +- .../exceptions/aroundInvoke/Interceptor4.java | 2 +- .../aroundInvoke/SimpleBinding.java | 8 +- .../AroundInvokeInterceptor.java | 2 +- .../interceptorLifeCycle/AttackBinding.java | 2 +- .../contract/interceptorLifeCycle/Bar.java | 2 +- .../contract/interceptorLifeCycle/Baz.java | 3 +- .../interceptorLifeCycle/BazBinding.java | 5 +- .../interceptorLifeCycle/MethodBinding.java | 10 +- .../MethodInterceptor.java | 2 +- .../PostConstructInterceptor.java | 2 +- .../PreDestroyInterceptor.java | 2 +- .../interceptorLifeCycle/Warrior.java | 3 +- .../WarriorAIInterceptor.java | 2 +- .../WarriorAttackAIInterceptor.java | 2 +- .../interceptorLifeCycle/WarriorBinding.java | 2 +- .../WarriorPCInterceptor.java | 2 +- .../WarriorPDInterceptor.java | 6 +- .../contract/interceptorLifeCycle/Weapon.java | 6 +- .../WeaponAIInterceptor.java | 2 +- .../interceptorLifeCycle/WeaponBinding.java | 8 +- .../aroundConstruct/Bar.java | 2 +- .../aroundConstruct/Baz.java | 5 +- .../aroundConstruct/Baz1Interceptor.java | 2 +- .../aroundConstruct/Baz2Interceptor.java | 2 +- .../aroundConstruct/BazBinding.java | 7 +- .../aroundConstruct/Foo.java | 2 +- .../aroundConstruct/FooBinding.java | 2 +- .../aroundConstruct/FooCommonInterceptor.java | 2 +- .../aroundConstruct/FooInterceptor.java | 2 +- .../aroundConstruct/FooSuperInterceptor.java | 2 +- .../returnValueIgnored/Foo.java | 5 +- .../returnValueIgnored/FooBinding.java | 2 +- .../aroundConstruct/withAroundInvoke/Foo.java | 2 +- .../withAroundInvoke/FooBinding.java | 2 +- .../AroundConstructBinding1.java | 12 +- .../AroundConstructBinding2.java | 12 +- .../AroundConstructInterceptor1.java | 6 +- .../AroundConstructInterceptor2.java | 6 +- .../contract/invocationContext/Binding1.java | 8 +- .../contract/invocationContext/Binding10.java | 8 +- .../contract/invocationContext/Binding11.java | 10 +- .../contract/invocationContext/Binding12.java | 10 +- .../contract/invocationContext/Binding13.java | 10 +- .../contract/invocationContext/Binding14.java | 12 +- .../contract/invocationContext/Binding15.java | 3 +- .../Binding15Additional.java | 6 +- .../contract/invocationContext/Binding16.java | 11 +- .../contract/invocationContext/Binding2.java | 8 +- .../contract/invocationContext/Binding3.java | 8 +- .../contract/invocationContext/Binding4.java | 8 +- .../contract/invocationContext/Binding5.java | 8 +- .../contract/invocationContext/Binding6.java | 8 +- .../contract/invocationContext/Binding7.java | 8 +- .../invocationContext/Interceptor1.java | 2 +- .../invocationContext/Interceptor10.java | 2 +- .../invocationContext/Interceptor12.java | 6 +- .../invocationContext/Interceptor2.java | 2 +- .../invocationContext/Interceptor3.java | 2 +- .../invocationContext/Interceptor4.java | 2 +- .../invocationContext/Interceptor5.java | 2 +- .../invocationContext/Interceptor6.java | 2 +- .../invocationContext/Interceptor7.java | 2 +- .../invocationContext/Interceptor8.java | 2 +- .../invocationContext/Interceptor9.java | 2 +- .../InvocationContextTest.java | 5 +- .../PostConstructInterceptor.java | 8 +- .../invocationContext/PseudoBinding.java | 11 +- .../invocationContext/SimpleBean.java | 2 +- .../invocationContext/SimpleBinding.java | 8 +- .../invocationContext/SimplePCBinding.java | 7 +- .../invocationContext/SuperBinding.java | 13 +- .../AlmightyLifecycleInterceptor.java | 2 +- .../contract/lifecycleCallback/Animal.java | 2 +- .../lifecycleCallback/AnimalBinding.java | 6 +- .../lifecycleCallback/AnimalInterceptor.java | 2 +- .../tests/contract/lifecycleCallback/Bar.java | 2 +- .../contract/lifecycleCallback/Chicken.java | 2 +- .../lifecycleCallback/ChickenBinding.java | 6 +- .../tests/contract/lifecycleCallback/Cow.java | 3 +- .../tests/contract/lifecycleCallback/Dog.java | 3 +- .../lifecycleCallback/DogBinding.java | 6 +- .../contract/lifecycleCallback/Goat.java | 3 +- .../tests/contract/lifecycleCallback/Hen.java | 3 +- .../PackagePrivateLifecycleInterceptor.java | 2 +- .../PrivateLifecycleInterceptor.java | 2 +- .../ProtectedLifecycleInterceptor.java | 2 +- .../PublicLifecycleInterceptor.java | 2 +- .../contract/lifecycleCallback/Sheep.java | 3 +- .../lifecycleCallback/SheepBinding.java | 8 +- .../lifecycleCallback/SheepInterceptor.java | 2 +- .../lifecycleCallback/bindings/Airborne.java | 2 +- .../bindings/AirborneInterceptor.java | 2 +- .../bindings/DestructionInterceptor.java | 2 +- .../bindings/Destructive.java | 2 +- .../lifecycleCallback/bindings/Foo.java | 2 +- .../LifecycleInterceptorDefinitionTest.java | 3 - .../lifecycleCallback/bindings/Missile.java | 2 +- .../bindings/SuperDestructionInterceptor.java | 2 +- .../lifecycleCallback/bindings/Weapon.java | 4 +- .../lifecycleCallback/exceptions/Cat.java | 3 +- .../exceptions/CatBinding.java | 6 +- .../exceptions/CatInterceptor.java | 2 +- .../lifecycleCallback/exceptions/Goat.java | 3 +- .../exceptions/GoatBinding.java | 6 +- .../exceptions/GoatInterceptor.java | 2 +- .../lifecycleCallback/exceptions/Sheep.java | 2 +- .../tests/order/aroundConstruct/Foo.java | 2 +- .../aroundConstruct/FooClassBinding.java | 8 +- .../order/aroundConstruct/FooCtorBinding.java | 11 +- .../order/aroundConstruct/Interceptor1.java | 2 +- .../order/aroundConstruct/Interceptor2.java | 2 +- .../order/aroundConstruct/Interceptor3.java | 2 +- .../order/aroundConstruct/Interceptor4.java | 2 +- .../aroundConstruct/MiddleInterceptor1.java | 2 +- .../aroundConstruct/SuperInterceptor1.java | 2 +- .../aroundInvoke/OverridenInterceptor.java | 2 +- .../tests/order/aroundInvoke/Tram.java | 1 - .../order/aroundInvoke/TramClassBinding.java | 8 +- .../order/aroundInvoke/TramCtorBinding.java | 10 +- .../order/aroundInvoke/TramMethodBinding.java | 10 +- .../tests/order/aroundInvoke/Vehicle.java | 6 +- .../order/lifecycleCallback/CargoShip.java | 2 +- .../order/lifecycleCallback/Interceptor1.java | 2 +- .../order/lifecycleCallback/Interceptor2.java | 2 +- .../order/lifecycleCallback/Interceptor3.java | 2 +- .../order/lifecycleCallback/Interceptor4.java | 2 +- .../lifecycleCallback/LakeCargoShip.java | 3 +- .../LakeCargoShipClassBinding.java | 8 +- .../tests/order/lifecycleCallback/Ship.java | 2 +- .../overriden/lifecycleCallback/Bird.java | 2 +- .../overriden/lifecycleCallback/Eagle.java | 2 +- .../overriden/lifecycleCallback/Falcon.java | 2 +- .../cdi/tck/literals/InheritedLiteral.java | 4 +- .../cdi/tck/literals/RetentionLiteral.java | 4 +- .../jboss/cdi/tck/literals/TargetLiteral.java | 4 +- .../cdi/tck/shrinkwrap/ArchiveBuilder.java | 126 +++++---- .../cdi/tck/shrinkwrap/URLPackageScanner.java | 20 +- .../cdi/tck/shrinkwrap/WebArchiveBuilder.java | 5 +- .../descriptors/ClassActivator.java | 2 +- .../resolution/qualifier/False.java | 2 +- .../qualifier/QualifierInheritedTest.java | 6 +- .../qualifier/QualifierNotDeclaredTest.java | 2 +- .../qualifier/QualifierNotInheritedTest.java | 6 +- .../resolution/qualifier/True.java | 2 +- .../selection/SelectedAlternative03Test.java | 4 +- .../tck/tests/alternative/selection/Tame.java | 2 +- .../tck/tests/alternative/selection/Wild.java | 2 +- .../selection/priority/ProducedByField.java | 4 +- .../selection/priority/ProducedByMethod.java | 4 +- .../ProducerExplicitPriorityTest.java | 6 +- .../priority/AlternativeStereotype.java | 2 +- .../stereotype/priority/StandardImpl.java | 4 +- ...WithAlternativeSelectedByPriorityTest.java | 8 +- .../tests/beanContainer/AnimalStereotype.java | 2 +- .../beanContainer/BeanContainerTest.java | 15 +- .../beanContainer/CustomContextImpl1.java | 4 +- .../beanContainer/CustomContextImpl2.java | 4 +- .../tck/tests/beanContainer/CustomScoped.java | 4 +- .../cdi/tck/tests/beanContainer/Dog.java | 2 +- .../cdi/tck/tests/beanContainer/DogHouse.java | 2 +- .../tck/tests/beanContainer/NoImplScope.java | 4 +- .../cdi/tck/tests/beanContainer/Tame.java | 2 +- .../cdi/tck/tests/beanContainer/Terrier.java | 2 +- .../tests/beanContainer/Transactional.java | 2 +- .../BeanEventAssignabilityTest.java | 190 ++++++++----- .../assignability/Qualifier1.java | 2 +- .../assignability/Qualifier2.java | 2 +- .../beanContainer/bytype/BeanByTypeTest.java | 11 +- .../beanContainer/bytype/DerivedBean.java | 2 +- .../beanContainer/bytype/NonBindingType.java | 2 +- .../bytype/NonBindingTypeLiteral.java | 2 +- .../beanContainer/bytype/SimpleBean.java | 2 +- .../tck/tests/beanContainer/bytype/Tame.java | 2 +- .../beanContainer/bytype/TameLiteral.java | 60 ++-- .../injection/BeanContainerInjectionTest.java | 1 + .../ChangeBeanQualifierTest.java | 6 +- .../changeBeanQualifier/MyQualifier.java | 4 +- .../ChangeInjectionPointTest.java | 4 +- .../changeInjectionPoint/MyQualifier.java | 4 +- .../ChangeInterceptorBindingTest.java | 9 +- .../changeInterceptorBinding/MyBinding.java | 2 +- .../ChangeObserverQualifierTest.java | 10 +- .../changeObserverQualifier/MyConsumer.java | 6 +- .../changeObserverQualifier/MyQualifier.java | 4 +- .../CustomInterceptorBindingExtension.java | 1 - .../CustomInterceptorBindingTest.java | 4 +- .../customNormalScope/CommandContext.java | 8 +- .../CommandContextController.java | 4 +- .../customNormalScope/CommandScoped.java | 6 +- .../CustomNormalScopeTest.java | 8 +- .../CustomPseudoScopeTest.java | 6 +- .../customPseudoScope/Prototype.java | 12 +- .../customPseudoScope/PrototypeContext.java | 4 +- .../customPseudoScope/PrototypeScoped.java | 4 +- .../customQualifier/CustomQualifierTest.java | 4 +- .../customQualifier/MyCustomQualifier.java | 4 +- .../CustomStereotypeTest.java | 7 +- .../InspectAnnotatedSubtypesExtension.java | 6 +- .../AbstractInvalidExtensionParamTest.java | 1 - .../EnhancementMultipleParams2Test.java | 3 +- .../EnhancementMultipleParamsTest.java | 6 +- .../invalid/EnhancementNoParamExtension.java | 1 + .../invalid/EnhancementNoParamTest.java | 3 +- .../invalid/EnhancementOnlyMessagesTest.java | 3 +- .../invalid/EnhancementOnlyTypesTest.java | 3 +- .../RegistrationMultipleParams2Test.java | 3 +- .../RegistrationMultipleParamsExtension.java | 2 +- .../RegistrationMultipleParamsExtension2.java | 2 +- .../RegistrationMultipleParamsTest.java | 3 +- .../invalid/RegistrationNoParamExtension.java | 2 +- .../invalid/RegistrationNoParamTest.java | 3 +- .../RegistrationOnlyMessagesExtension.java | 2 +- .../invalid/RegistrationOnlyMessagesTest.java | 3 +- .../RegistrationOnlyTypesExtension.java | 2 +- .../invalid/RegistrationOnlyTypesTest.java | 3 +- .../priority/PriorityExtension.java | 6 +- .../registration/MyInterceptorBinding.java | 6 +- .../extensions/registration/MyQualifier.java | 4 +- .../registration/RegistrationExtension.java | 4 +- .../syntheticBean/MyPojoDisposer.java | 6 +- .../extensions/syntheticBean/MyQualifier.java | 4 +- .../syntheticBean/MySimpleValue.java | 4 +- .../syntheticBean/SyntheticBeanExtension.java | 9 +- .../syntheticBean/SyntheticBeanTest.java | 9 +- .../SyntheticBeanInjectionPointTest.java | 9 +- .../MyDependentBean.java | 4 +- .../MyPojoCreator.java | 4 +- .../MyPojoDisposer.java | 4 +- .../SyntheticBeanWithLookupTest.java | 5 +- .../syntheticObserver/MyObserver.java | 6 +- .../syntheticObserver/MyQualifier.java | 4 +- .../SyntheticObserverTest.java | 9 +- .../MyObserver.java | 8 +- .../MyService.java | 4 +- ...cObserverOfParameterizedTypeExtension.java | 6 +- ...theticObserverOfParameterizedTypeTest.java | 8 +- .../extensions/validation/ValidationTest.java | 1 + .../tck/tests/context/AnotherRequestBean.java | 2 +- .../DestroyForSameCreationalContext2Test.java | 4 +- .../DestroyForSameCreationalContextTest.java | 4 +- .../DestroyedInstanceReturnedByGetTest.java | 3 +- .../tests/context/GetFromContextualTest.java | 5 +- .../context/GetOnInactiveContextTest.java | 3 +- .../GetWithNoCreationalContextTest.java | 3 +- .../tck/tests/context/MyApplicationBean.java | 4 +- .../cdi/tck/tests/context/MyRequestBean.java | 4 +- .../alterable/AlterableContextTest.java | 4 +- .../context/dependent/AccountTransaction.java | 2 +- .../tck/tests/context/dependent/Animal.java | 36 +-- .../dependent/ApplicationHorseStable.java | 2 +- .../tests/context/dependent/DeadlyAnimal.java | 36 +-- .../tests/context/dependent/DeadlySpider.java | 36 +-- .../dependent/DependentContextTest.java | 7 +- .../cdi/tck/tests/context/dependent/Farm.java | 2 +- .../cdi/tck/tests/context/dependent/Fox.java | 2 +- .../tck/tests/context/dependent/FoxFarm.java | 2 +- .../tck/tests/context/dependent/FoxHole.java | 2 +- .../tests/context/dependent/FoxProducer.java | 2 +- .../tck/tests/context/dependent/FoxRun.java | 2 +- .../tck/tests/context/dependent/Horse.java | 2 +- .../context/dependent/HorseInStableEvent.java | 2 +- .../tests/context/dependent/HorseStable.java | 2 +- .../dependent/OtherSpiderProducer.java | 80 +++--- .../cdi/tck/tests/context/dependent/Pet.java | 2 +- .../tests/context/dependent/SensitiveFox.java | 2 +- .../tck/tests/context/dependent/Spider.java | 48 ++-- .../context/dependent/SpiderProducer.java | 2 +- .../tck/tests/context/dependent/Stable.java | 2 +- .../cdi/tck/tests/context/dependent/Tame.java | 72 ++--- .../tests/context/dependent/Tarantula.java | 122 ++++----- .../context/dependent/Transactional.java | 2 +- .../dependent/TransactionalInterceptor.java | 2 +- .../BuiltinInstanceDependentObjectTest.java | 2 +- .../tests/context/dependent/instance/Foo.java | 2 +- .../dependent/transientreference/Meal.java | 1 - .../definition/bean/AbstractAntelope.java | 2 +- .../cdi/tck/tests/definition/bean/Animal.java | 36 +-- .../definition/bean/AnimalStereotype.java | 66 ++--- .../definition/bean/BeanDefinitionTest.java | 8 +- .../definition/bean/ComplicatedTuna.java | 2 +- .../tests/definition/bean/DeadlyAnimal.java | 36 +-- .../tests/definition/bean/DeadlySpider.java | 36 +-- .../definition/bean/DependentFinalTuna.java | 42 +-- .../tests/definition/bean/FishStereotype.java | 66 ++--- .../definition/bean/FriendlyAntelope.java | 2 +- .../cdi/tck/tests/definition/bean/Horse.java | 4 +- .../tck/tests/definition/bean/RedSnapper.java | 44 +-- .../cdi/tck/tests/definition/bean/Spider.java | 50 ++-- .../tests/definition/bean/SpiderProducer.java | 80 +++--- .../cdi/tck/tests/definition/bean/Tame.java | 68 ++--- .../tck/tests/definition/bean/Tarantula.java | 42 +-- .../tck/tests/definition/bean/WolfSpider.java | 42 +-- .../bean/broken/restricted/Animal.java | 4 +- .../bean/broken/restricted/Boulder.java | 4 +- .../restricted/BoulderFieldProducer.java | 4 +- .../restricted/BoulderMethodProducer.java | 4 +- .../restricted/RestrictedManagedBeanTest.java | 7 +- .../RestrictedProducerFieldTest.java | 4 +- .../RestrictedProducerMethodTest.java | 4 +- .../bean/broken/restricted/Stone.java | 4 +- .../bean/genericbroken/FooBroken.java | 2 +- .../genericbroken/GenericManagedBeanTest.java | 2 +- .../tests/definition/bean/types/Flock.java | 5 - .../bean/types/ManagedBeanTypesTest.java | 5 +- .../definition/bean/types/illegal/Animal.java | 2 +- .../illegal/BeanTypesWithIllegalTypeTest.java | 4 +- .../bean/types/illegal/EagleProducer.java | 2 +- .../bean/types/illegal/ProducedWithField.java | 2 +- .../cdi/tck/tests/definition/name/Animal.java | 36 +-- .../tests/definition/name/FishStereotype.java | 66 ++--- .../tck/tests/definition/name/Haddock.java | 50 ++-- .../cdi/tck/tests/definition/name/Minnow.java | 38 +-- .../cdi/tck/tests/definition/name/Moose.java | 50 ++-- .../definition/name/NameDefinitionTest.java | 2 +- .../tck/tests/definition/name/RedSnapper.java | 44 +-- .../definition/name/RiverFishStereotype.java | 58 ++-- .../tck/tests/definition/name/SeaBass.java | 42 +-- .../tests/definition/name/_Underscore.java | 1 - .../tests/definition/qualifier/Animal.java | 36 +-- .../tck/tests/definition/qualifier/Barn.java | 50 ++-- .../definition/qualifier/BorderCollie.java | 2 +- .../tck/tests/definition/qualifier/Cat.java | 44 +-- .../tests/definition/qualifier/Chunky.java | 72 ++--- .../definition/qualifier/ChunkyQualifier.java | 2 +- .../qualifier/ClippedBorderCollie.java | 2 +- .../tck/tests/definition/qualifier/Cod.java | 50 ++-- .../definition/qualifier/DeadlyAnimal.java | 36 +-- .../definition/qualifier/DeadlySpider.java | 36 +-- .../qualifier/DefangedTarantula.java | 46 ++-- .../qualifier/EnglishBorderCollie.java | 42 +-- .../tck/tests/definition/qualifier/Hairy.java | 2 +- .../definition/qualifier/HairyQualifier.java | 2 +- .../tck/tests/definition/qualifier/Horse.java | 2 +- .../definition/qualifier/LongHairedDog.java | 2 +- .../qualifier/MiniatureShetlandPony.java | 2 +- .../tests/definition/qualifier/Produced.java | 68 ++--- .../qualifier/QualifierDefinitionTest.java | 5 +- .../definition/qualifier/ScottishFish.java | 36 +-- .../definition/qualifier/ShetlandPony.java | 2 +- .../tests/definition/qualifier/Species.java | 2 +- .../tests/definition/qualifier/Spider.java | 44 +-- .../definition/qualifier/SpiderProducer.java | 66 ++--- .../definition/qualifier/Synchronous.java | 68 ++--- .../qualifier/SynchronousQualifier.java | 2 +- .../tck/tests/definition/qualifier/Tame.java | 68 ++--- .../definition/qualifier/TameLiteral.java | 2 +- .../tests/definition/qualifier/Tarantula.java | 50 ++-- .../tck/tests/definition/qualifier/Tuna.java | 50 ++-- .../tests/definition/qualifier/Whitefish.java | 68 ++--- .../qualifier/WhitefishQualifier.java | 2 +- .../qualifier/builtin/BeanProducer.java | 10 +- .../BuiltInQualifierDefinitionTest.java | 17 +- .../definition/qualifier/builtin/Order.java | 48 ++-- .../qualifier/builtin/OrderProcessor.java | 42 +-- .../qualifier/repeatable/Start.java | 1 + .../tck/tests/definition/scope/Animal.java | 36 +-- .../definition/scope/AnimalStereotype.java | 66 ++--- .../tests/definition/scope/AnotherScope.java | 2 +- .../definition/scope/AnotherScopeType.java | 66 ++--- .../tests/definition/scope/BorderCollie.java | 2 +- .../tests/definition/scope/Clydesdale.java | 2 +- .../cdi/tck/tests/definition/scope/Dog.java | 2 +- .../definition/scope/DummyStereotype.java | 4 +- .../definition/scope/EnglishBorderCollie.java | 38 +-- .../definition/scope/FishStereotype.java | 66 ++--- .../definition/scope/GoldenLabrador.java | 2 +- .../definition/scope/GoldenRetriever.java | 2 +- .../tck/tests/definition/scope/Grayling.java | 40 +-- .../cdi/tck/tests/definition/scope/Horse.java | 2 +- .../tck/tests/definition/scope/Labrador.java | 2 +- .../definition/scope/MiniatureClydesdale.java | 2 +- .../tck/tests/definition/scope/Minnow.java | 44 +-- .../tck/tests/definition/scope/Mullet.java | 38 +-- .../definition/scope/NotInheritedScope.java | 2 +- .../cdi/tck/tests/definition/scope/Order.java | 38 +-- .../tck/tests/definition/scope/Pollock.java | 46 ++-- .../tests/definition/scope/RedSnapper.java | 44 +-- .../tck/tests/definition/scope/Retriever.java | 2 +- .../definition/scope/RiverFishStereotype.java | 62 ++--- .../definition/scope/ScopeDefinitionTest.java | 8 +- .../tck/tests/definition/scope/SeaBass.java | 42 +-- .../tests/definition/scope/ShetlandPony.java | 2 +- .../BeanWithTooManyScopeTypes_Broken.java | 44 +-- .../tooManyScopes/TooManyScopesTest.java | 8 +- .../field/ProducerFieldTooManyScopesTest.java | 8 +- ...ucerFieldWithTooManyScopeTypes_Broken.java | 52 ++-- .../tooManyScopes/producer/field/Word.java | 2 +- .../ProducerMethodTooManyScopesTest.java | 8 +- ...cerMethodWithTooManyScopeTypes_Broken.java | 56 ++-- .../tooManyScopes/producer/method/Word.java | 2 +- .../ScopeDefinedInOtherBDATest.java | 3 +- .../scope/inOtherBda/ThirdPartyScopeBean.java | 5 +- .../tests/definition/stereotype/Animal.java | 36 +-- .../stereotype/AnimalStereotype.java | 2 +- .../stereotype/AnotherStereotype.java | 2 +- ...plicationScopedHornedMammalStereotype.java | 2 +- .../definition/stereotype/BorderCollie.java | 2 +- .../definition/stereotype/Chihuahua.java | 46 ++-- .../definition/stereotype/Clydesdale.java | 2 +- .../stereotype/DummyStereotype.java | 4 +- .../stereotype/EnglishBorderCollie.java | 38 +-- .../tck/tests/definition/stereotype/Goat.java | 38 +-- .../tests/definition/stereotype/Goldfish.java | 2 +- .../definition/stereotype/HighlandCow.java | 2 +- .../stereotype/HornedMammalStereotype.java | 2 +- .../tests/definition/stereotype/Horse.java | 2 +- .../definition/stereotype/LongHairedDog.java | 2 +- .../stereotype/MexicanChihuahua.java | 48 ++-- .../stereotype/MiniatureClydesdale.java | 2 +- .../tests/definition/stereotype/Moose.java | 2 +- .../definition/stereotype/NonStereotype.java | 52 ++-- .../tests/definition/stereotype/Reindeer.java | 2 +- .../definition/stereotype/ShetlandPony.java | 2 +- .../definition/stereotype/ShortHairedDog.java | 58 ++-- .../definition/stereotype/Springbok.java | 2 +- .../stereotype/StereotypeDefinitionTest.java | 18 +- .../tck/tests/definition/stereotype/Tame.java | 2 +- .../AnotherPriorityStereotype.java | 9 +- ...ingPrioritiesFromSingleStereotypeTest.java | 1 + .../ConflictingPriorityStereotypesTest.java | 1 + .../PriorityStereotype2.java | 6 +- .../broken/multiplePriorities/SomeBean.java | 1 + .../inherited/AnotherDumbStereotype.java | 4 +- .../AnotherStereotypeWithPriority.java | 6 +- ...ereotypeInheritedPriorityConflictTest.java | 1 + .../nonEmptyNamed/FallowDeer_Broken.java | 2 +- .../nonEmptyNamed/NonEmptyNamedTest.java | 2 +- .../StereotypeWithNonEmptyNamed_Broken.java | 2 +- .../scopeConflict/AnimalStereotype.java | 66 ++--- .../broken/scopeConflict/FishStereotype.java | 62 ++--- .../IncompatibleStereotypesTest.java | 2 +- .../broken/scopeConflict/Scallop_Broken.java | 48 ++-- .../transitive/AnimalStereotype.java | 12 +- .../transitive/FishStereotype.java | 8 +- ...TransitiveIncompatibleStereotypesTest.java | 5 +- .../broken/tooManyScopes/Elk_Broken.java | 2 +- ...tereotypeWithTooManyScopeTypes_Broken.java | 2 +- .../tooManyScopes/TooManyScopeTypesTest.java | 5 +- .../broken/withBindingType/Asynchronous.java | 2 +- .../withBindingType/RoeDeer_Broken.java | 2 +- .../StereoTypeWithBindingTypesTest.java | 2 +- .../StereotypeWithBindingTypes_Broken.java | 2 +- .../stereotype/inheritance/Horse.java | 4 +- .../NamedRequestPolicyStereotype.java | 2 +- .../inheritance/NamedRequestStereotype.java | 2 +- .../inheritance/NamedStereotype.java | 2 +- .../StereotypeInheritenceTest.java | 8 +- .../interceptor/AlphaInterceptor.java | 2 +- .../interceptor/AlphaOmegaStereotype.java | 76 +++--- .../stereotype/interceptor/Foo.java | 2 +- .../stereotype/interceptor/Omega.java | 2 +- .../interceptor/OmegaInterceptor.java | 4 +- ...peWithMultipleInterceptorBindingsTest.java | 1 - .../stereotype/named/DefaultNamedTest.java | 2 +- .../stereotype/named/FallowDeer.java | 2 +- .../definition/stereotype/named/RoeDeer.java | 4 +- .../named/StereotypeWithEmptyNamed.java | 2 +- .../AlternativePriorityStereotype.java | 6 +- .../priority/PriorityStereotype.java | 6 +- .../priority/StereotypeWithPriorityTest.java | 1 + .../priority/inherited/DumbStereotype.java | 4 +- .../StereotypeInheritedPriorityTest.java | 1 + .../inherited/StereotypeWithPriority.java | 6 +- .../discovery/EmptyBeansXmlDiscoveryTest.java | 1 + .../discovery/SomeAnnotatedBean.java | 3 +- .../cdi/tck/tests/event/BullTerrier.java | 2 +- .../jboss/cdi/tck/tests/event/Delivery.java | 2 +- .../org/jboss/cdi/tck/tests/event/Egg.java | 2 +- .../cdi/tck/tests/event/EventPayload.java | 2 +- .../jboss/cdi/tck/tests/event/EventTest.java | 12 +- .../org/jboss/cdi/tck/tests/event/Farmer.java | 2 +- .../tck/tests/event/IndirectStockWatcher.java | 42 +-- .../tests/event/IntermediateStockWatcher.java | 42 +-- .../jboss/cdi/tck/tests/event/LazyFarmer.java | 2 +- .../tck/tests/event/MultiBindingEvent.java | 2 +- .../tck/tests/event/OrangeCheekedWaxbill.java | 2 +- .../cdi/tck/tests/event/PrivateObserver.java | 15 +- .../org/jboss/cdi/tck/tests/event/Role.java | 64 ++--- .../cdi/tck/tests/event/RoleLiteral.java | 58 ++-- .../cdi/tck/tests/event/StaticObserver.java | 2 +- .../jboss/cdi/tck/tests/event/StockPrice.java | 34 +-- .../cdi/tck/tests/event/StockWatcher.java | 50 ++-- .../org/jboss/cdi/tck/tests/event/Tame.java | 2 +- .../tests/event/TameAnnotationLiteral.java | 42 +-- .../cdi/tck/tests/event/TerrierObserver.java | 2 +- .../org/jboss/cdi/tck/tests/event/Volume.java | 2 +- .../tck/tests/event/bindingTypes/Animal.java | 2 +- .../event/bindingTypes/AnimalAssessment.java | 2 +- .../bindingTypes/DiscerningObserver.java | 2 +- .../bindingTypes/EventBindingTypesTest.java | 3 +- .../event/bindingTypes/EventEmitter.java | 2 +- .../event/bindingTypes/NonBindingType.java | 6 +- .../bindingTypes/NonRuntimeBindingType.java | 2 +- .../tck/tests/event/bindingTypes/Tame.java | 2 +- .../bindingTypes/TameAnnotationLiteral.java | 38 +-- .../tck/tests/event/bindingTypes/Wild.java | 2 +- .../bindingTypes/WildAnnotationLiteral.java | 38 +-- .../observer/beanNotManaged/AbstractBean.java | 2 +- .../observer/beanNotManaged/ConcreteBean.java | 2 +- .../beanNotManaged/NonManagedBean.java | 4 +- .../ObserverMethodOnIncorrectBeanTest.java | 4 +- .../BrokenObserver.java | 2 +- ...dParameterAnnotatedAsSyncAndAsyncTest.java | 5 +- .../AlarmSystem.java | 2 +- .../BreakIn.java | 2 +- .../DependentIsConditionalObserverTest.java | 2 +- .../inject/DeploymentFailureTest.java | 2 +- .../inject/InitializerBean_Broken.java | 50 ++-- .../isDisposer/FoxTerrier_Broken.java | 4 +- .../ObserverMethodAnnotatedDisposesTest.java | 4 +- .../isProducer/BorderTerrier_Broken.java | 5 +- .../ObserverMethodAnnotatedProducesTest.java | 4 +- .../observer/tooManyParameters/Boxer.java | 34 +-- ...bservesAndObservesAsyncParametersTest.java | 5 +- ...erverMethodWithTwoEventParametersTest.java | 5 +- .../YorkshireTerrier_Broken.java | 2 +- .../broken/raw/ConstructorInjectionBar.java | 2 +- .../raw/DisposerMethodInjectionBar.java | 2 +- .../event/broken/raw/FieldInjectionBar.java | 2 +- .../cdi/tck/tests/event/broken/raw/Foo.java | 2 +- .../broken/raw/InitMethodInjectionBar.java | 2 +- .../broken/raw/ObserverInjectionBar.java | 2 +- .../raw/ProducerMethodInjectionBar.java | 2 +- .../raw/RawEventConstructorInjectionTest.java | 2 +- .../raw/RawEventDisposerInjectionTest.java | 2 +- .../raw/RawEventFieldInjectionTest.java | 2 +- .../raw/RawEventInitMethodInjectionTest.java | 2 +- .../raw/RawEventObserverInjectionTest.java | 2 +- .../RawEventProducerMethodInjectionTest.java | 2 +- .../tests/event/eventTypes/AbstractEvent.java | 4 +- .../tck/tests/event/eventTypes/Artist.java | 2 +- .../tck/tests/event/eventTypes/Broadcast.java | 2 +- .../tests/event/eventTypes/ComplexEvent.java | 4 +- .../eventTypes/EventTypeFamilyObserver.java | 4 +- .../event/eventTypes/EventTypesTest.java | 7 +- .../tests/event/eventTypes/GeneralEvent.java | 4 +- .../tck/tests/event/eventTypes/Listener.java | 2 +- .../cdi/tck/tests/event/eventTypes/Solo.java | 2 +- .../cdi/tck/tests/event/eventTypes/Song.java | 2 +- .../tests/event/eventTypes/TuneSelect.java | 2 +- .../jboss/cdi/tck/tests/event/fires/Bar.java | 2 +- .../cdi/tck/tests/event/fires/Billing.java | 2 +- .../tck/tests/event/fires/DogWhisperer.java | 2 +- .../tck/tests/event/fires/DoggiePoints.java | 2 +- .../tck/tests/event/fires/FireEventTest.java | 8 +- .../jboss/cdi/tck/tests/event/fires/Foo.java | 2 +- .../tck/tests/event/fires/Housekeeping.java | 2 +- .../jboss/cdi/tck/tests/event/fires/Item.java | 3 +- .../tck/tests/event/fires/Item_Illegal.java | 3 +- .../cdi/tck/tests/event/fires/Lifted.java | 10 +- .../cdi/tck/tests/event/fires/MiniBar.java | 3 +- .../cdi/tck/tests/event/fires/Praise.java | 2 +- .../cdi/tck/tests/event/fires/Restored.java | 2 +- .../jboss/cdi/tck/tests/event/fires/Role.java | 64 ++--- .../jboss/cdi/tck/tests/event/fires/Tame.java | 2 +- .../tck/tests/event/fires/TamingCommand.java | 2 +- .../fires/nonbinding/AnimalStereotype.java | 2 +- .../AnimalStereotypeAnnotationLiteral.java | 2 +- .../NonBindingTypePassedToFireTest.java | 2 +- .../fires/nonbinding/OwlFinch_Broken.java | 2 +- .../event/fires/sync/FireSyncEventTest.java | 3 +- .../tck/tests/event/fires/sync/Helper.java | 6 +- .../tck/tests/event/implicit/AwardEvent.java | 2 +- .../cdi/tck/tests/event/implicit/Awards.java | 6 +- .../cdi/tck/tests/event/implicit/Course.java | 2 +- .../tests/event/implicit/CourseFullEvent.java | 2 +- .../cdi/tck/tests/event/implicit/Honors.java | 2 +- .../tests/event/implicit/HonorsLiteral.java | 2 +- .../event/implicit/ImplicitEventTest.java | 4 +- .../tests/event/implicit/Registration.java | 2 +- .../cdi/tck/tests/event/implicit/Student.java | 2 +- .../event/implicit/StudentDirectory.java | 2 +- .../implicit/StudentRegisteredEvent.java | 2 +- .../tests/event/lifecycle/ObservingBean.java | 6 +- .../event/lifecycle/StartupShutdownTest.java | 1 + .../tests/event/metadata/DuckNotifier.java | 5 +- .../event/metadata/EventMetadataTest.java | 1 - .../event/metadata/SimpleEventObserver.java | 1 - .../EventMetadataInjectionPointTest.java | 15 +- .../event/metadata/injectionpoint/Nice.java | 2 +- .../metadata/injectionpoint/Notifier.java | 1 - .../tck/tests/event/observer/AnEventType.java | 2 +- .../tck/tests/event/observer/AnObserver.java | 2 +- .../event/observer/AnotherEventType.java | 2 +- .../tests/event/observer/AnotherObserver.java | 2 +- .../event/observer/DisabledObserver.java | 2 +- .../tests/event/observer/EventPayload.java | 2 +- .../tests/event/observer/LastObserver.java | 2 +- .../observer/ObserverNotificationTest.java | 6 +- .../cdi/tck/tests/event/observer/Role.java | 76 +++--- .../tck/tests/event/observer/RoleLiteral.java | 82 +++--- ...ObserverExceptionAbortsProcessingTest.java | 2 +- ...nOrderedObserversAbortsProcessingTest.java | 3 +- .../orderedObservers/OrderedObservers.java | 2 +- .../observer/async/basic/Experiment.java | 2 +- .../async/executor/CustomExecutor.java | 2 +- .../async/executor/MessageObserver.java | 8 +- ...ExceptionsInObserversNotificationTest.java | 2 +- .../NewYorkRadioStation.java | 6 +- .../PragueRadioStation.java | 6 +- .../handlingExceptions/RadioMessage.java | 1 - .../broken/validation/ambiguous/Observer.java | 2 +- ...ethodParameterInjectionValidationTest.java | 5 +- .../validation/unsatisfied/Observer.java | 2 +- ...ethodParameterInjectionValidationTest.java | 7 +- .../CheckedExceptionWrappedTest.java | 4 +- .../event/observer/checkedException/Tame.java | 2 +- .../checkedException/TeaCupPomeranian.java | 2 +- .../conditional/ConditionalEvent.java | 2 +- .../conditional/ConditionalObserverTest.java | 9 +- .../observer/conditional/RecluseSpider.java | 4 +- .../event/observer/conditional/Spun.java | 2 +- .../event/observer/conditional/Tarantula.java | 2 +- .../observer/conditional/TarantulaEvent.java | 2 +- .../tests/event/observer/conditional/Web.java | 2 +- .../inheritance/AbstractEggObserver.java | 2 +- .../tests/event/observer/inheritance/Bar.java | 2 +- .../tests/event/observer/inheritance/Baz.java | 2 +- .../tests/event/observer/inheritance/Egg.java | 3 +- .../tests/event/observer/inheritance/Foo.java | 2 +- .../inheritance/ObserverInheritanceTest.java | 5 +- .../observer/method/ConditionalEvent.java | 2 +- .../observer/method/ConditionalObserver.java | 2 +- .../event/observer/method/DisobedientDog.java | 2 +- .../event/observer/method/EventPayload.java | 2 +- .../observer/method/IntegerObserver.java | 2 +- .../tests/event/observer/method/LargeDog.java | 2 +- .../tests/event/observer/method/Number.java | 1 - .../observer/method/ObserverMethodTest.java | 6 +- .../tests/event/observer/method/ShowDog.java | 2 +- .../tests/event/observer/method/SmallDog.java | 2 +- .../event/observer/method/StockPrice.java | 34 +-- .../event/observer/method/StockWatcher.java | 72 ++--- .../method/TransactionalObservers.java | 2 +- .../priority/EventObserverOrderingTest.java | 1 + .../event/observer/priority/Moonrise.java | 1 - .../event/observer/priority/Sunrise.java | 1 - .../ApplicationScopedObserver.java | 9 +- .../observer/resolve/AirConditioner.java | 2 +- .../event/observer/resolve/BatteryEvent.java | 2 +- .../event/observer/resolve/BullTerrier.java | 2 +- .../tests/event/observer/resolve/Cloud.java | 2 +- .../observer/resolve/DisabledObserver.java | 2 +- .../observer/resolve/DiskSpaceEvent.java | 2 +- .../tests/event/observer/resolve/Ghost.java | 2 +- .../observer/resolve/MultiBindingEvent.java | 2 +- .../event/observer/resolve/NotEnabled.java | 2 +- .../event/observer/resolve/Pomeranian.java | 2 +- .../observer/resolve/PriviledgedObserver.java | 2 +- .../resolve/ResolveEventObserversTest.java | 18 +- .../tests/event/observer/resolve/Role.java | 64 ++--- .../event/observer/resolve/RoleBinding.java | 58 ++-- .../tests/event/observer/resolve/Secret.java | 2 +- .../observer/resolve/SimpleEventType.java | 2 +- .../event/observer/resolve/SystemMonitor.java | 9 +- .../tests/event/observer/resolve/Tame.java | 2 +- .../resolve/TameAnnotationLiteral.java | 40 +-- .../event/observer/resolve/Temperature.java | 2 +- .../event/observer/resolve/Thermostat.java | 2 +- .../ObserverExceptionRethrownTest.java | 4 +- .../runtimeException/TeaCupPomeranian.java | 5 +- .../wildcardAndTypeVariable/Behavior.java | 4 +- ...erverMethodWithParametertizedTypeTest.java | 1 + .../event/parameterized/EventObserver.java | 4 +- .../parameterized/IntegerListObserver.java | 4 +- .../parameterized/ParameterizedEventTest.java | 6 +- .../parameterized/StringListObserver.java | 4 +- .../event/resolve/binding/BindingTypeA.java | 2 +- .../resolve/binding/BindingTypeABinding.java | 8 +- .../event/resolve/binding/BindingTypeB.java | 2 +- .../resolve/binding/BindingTypeBBinding.java | 2 +- .../event/resolve/binding/BindingTypeC.java | 2 +- .../resolve/binding/BindingTypeCBinding.java | 2 +- ...uplicateBindingTypesWhenResolvingTest.java | 5 +- ...ResolvingChecksBindingTypeMembersTest.java | 14 +- .../resolve/nonbinding/AnimalStereotype.java | 2 +- .../AnimalStereotypeAnnotationLiteral.java | 2 +- .../NonBindingTypesWhenResolvingTest.java | 2 +- .../event/resolve/typeWithParameters/Box.java | 2 +- ...eParametersWhenResolvingObserversTest.java | 20 +- .../ChecksEventTypeWhenResolvingTest.java | 2 +- .../event/resolve/typeWithParameters/Foo.java | 2 +- .../typeWithParameters/FooObserver.java | 2 +- .../typeWithParameters/RawTypeObserver.java | 2 +- .../typeWithParameters/UnusedEventType.java | 2 +- .../tck/tests/event/select/AlarmSystem.java | 2 +- .../tck/tests/event/select/BreakInEvent.java | 2 +- .../tests/event/select/NotABindingType.java | 6 +- .../tck/tests/event/select/SecurityEvent.java | 2 +- .../event/select/SecurityEvent_Illegal.java | 2 +- .../tests/event/select/SecuritySensor.java | 2 +- .../tests/event/select/SelectEventTest.java | 5 +- .../tck/tests/event/select/SystemTest.java | 8 +- .../cdi/tck/tests/event/select/Violent.java | 2 +- .../AlternativeAvailabilityTest.java | 12 +- .../tck/tests/full/alternative/Animal.java | 2 +- .../cdi/tck/tests/full/alternative/Bird.java | 2 +- .../tests/full/alternative/BirdProducer.java | 2 +- .../cdi/tck/tests/full/alternative/Cat.java | 2 +- .../tests/full/alternative/CatProducer.java | 2 +- .../tck/tests/full/alternative/Chicken.java | 2 +- .../cdi/tck/tests/full/alternative/Dog.java | 2 +- .../EnabledAlternativeStereotype.java | 8 +- .../alternative/EnabledSheepProducer.java | 2 +- .../cdi/tck/tests/full/alternative/Horse.java | 2 +- .../NotEnabledAlternativeStereotype.java | 8 +- .../alternative/NotEnabledSheepProducer.java | 2 +- .../cdi/tck/tests/full/alternative/Sheep.java | 2 +- .../tests/full/alternative/SnakeProducer.java | 3 +- .../cdi/tck/tests/full/alternative/Tame.java | 8 +- .../cdi/tck/tests/full/alternative/Wild.java | 8 +- .../name/NoClassWithSpecifiedNameTest.java | 1 + .../NoAnnotationWithSpecifiedNameTest.java | 1 + .../broken/not/alternative/Cat.java | 2 +- .../ClassIsNotAlternativeTest.java | 1 + .../not/alternative/stereotype/Mock.java | 2 +- .../broken/same/type/twice/Cat.java | 2 +- .../broken/same/type/twice/Dog.java | 2 +- ...ectedBeanWithUnselectedStereotypeTest.java | 5 +- .../stereotype/UnselectedStereotype.java | 2 +- .../veto/AlternativeConsumerProducer.java | 4 +- .../veto/AlternativeConsumerStereotype.java | 1 + .../veto/VetoedAlternativeTest.java | 1 + .../context/AfterBeanDiscoveryObserver.java | 2 +- .../full/context/AnotherSessionBean.java | 6 +- .../context/ContextDestroysBeansTest.java | 4 +- .../tck/tests/full/context/ContextTest.java | 2 +- .../DestroyForSameCreationalContext2Test.java | 4 +- .../DestroyForSameCreationalContextTest.java | 3 +- .../DestroyedInstanceReturnedByGetTest.java | 1 + .../tck/tests/full/context/DummyContext.java | 2 +- .../full/context/GetFromContextualTest.java | 1 + .../context/GetOnInactiveContextTest.java | 1 + .../GetWithNoCreationalContextTest.java | 1 + .../tck/tests/full/context/MyContextual.java | 2 +- .../tck/tests/full/context/MySessionBean.java | 6 +- .../tests/full/context/NormalContextTest.java | 4 +- .../tck/tests/full/context/SimpleBeanA.java | 6 +- .../tck/tests/full/context/SimpleBeanB.java | 6 +- .../tck/tests/full/context/SimpleBeanZ.java | 6 +- .../tck/tests/full/context/Unregistered.java | 2 +- .../alterable/AlterableContextTest.java | 5 +- .../full/context/alterable/CustomContext.java | 8 +- .../full/context/alterable/CustomScoped.java | 4 +- .../dependent/DependentContextTest.java | 9 +- .../tck/tests/full/context/dependent/Fox.java | 2 +- .../full/context/dependent/FoxProducer.java | 2 +- .../tests/full/context/dependent/FoxRun.java | 2 +- .../tck/tests/full/context/dependent/Pet.java | 14 +- .../full/context/dependent/SensitiveFox.java | 2 +- .../tests/full/context/passivating/Big.java | 2 +- .../tests/full/context/passivating/City.java | 40 +-- .../full/context/passivating/CityBinding.java | 64 ++--- .../context/passivating/CityProducer.java | 56 ++-- .../context/passivating/CityProducer2.java | 52 ++-- .../full/context/passivating/Generator.java | 2 +- .../passivating/HelsinkiNonSerializable.java | 50 ++-- .../full/context/passivating/Hyvinkaa.java | 54 ++-- .../full/context/passivating/Joensuu.java | 56 ++-- .../full/context/passivating/Jyvaskyla.java | 48 ++-- .../full/context/passivating/Kajaani.java | 2 +- .../context/passivating/NumberConsumer.java | 2 +- .../passivating/PassivatingContextTest.java | 2 +- .../full/context/passivating/Record.java | 2 +- .../context/passivating/RecordProducer.java | 6 +- .../full/context/passivating/Salo_Broken.java | 58 ++-- .../context/passivating/SerializableCity.java | 6 +- .../passivating/SerializableCityConsumer.java | 2 +- .../full/context/passivating/Sleeping.java | 2 +- .../tests/full/context/passivating/Sysma.java | 6 +- .../full/context/passivating/Television.java | 2 +- .../passivating/TelevisionProducer.java | 2 +- .../full/context/passivating/Violation.java | 44 +-- .../tests/full/context/passivating/Wheat.java | 2 +- .../context/passivating/WheatProducer.java | 6 +- .../passivating/broken/Hamina_Broken.java | 42 +-- ...ionManagedBeanHasPassivatingScopeTest.java | 4 +- .../broken/constructor/Vantaa_Broken.java | 58 ++-- .../broken/constructor/Violation.java | 42 +-- .../decorator/MaarianhaminaDecorator.java | 2 +- .../decorator/Maarianhamina_Broken.java | 42 +-- ...edBeanWithNonPassivatingDecoratorTest.java | 3 +- .../broken/decorator/field/CityDecorator.java | 2 +- .../broken/decorator/field/CityInterface.java | 36 +-- ...orWithNonPassivatingInjectedFieldTest.java | 2 +- .../decorator/field/NonPassivating.java | 2 +- .../decorator/field/UnderwaterCity.java | 2 +- .../broken/field/Vantaa_Broken.java | 80 +++--- .../passivating/broken/field/Violation.java | 42 +-- .../broken/initializer/Vantaa_Broken.java | 58 ++-- .../broken/initializer/Violation.java | 42 +-- .../interceptor/Interceptor_Broken.java | 2 +- .../broken/interceptor/Kokkola_Broken.java | 2 +- ...thNonSerializableInterceptorClassTest.java | 2 +- .../broken/interceptor/field/BakedBean.java | 2 +- .../interceptor/field/BakedBinding.java | 2 +- .../interceptor/field/BrokenInterceptor.java | 2 +- .../interceptor/field/InterceptorType.java | 2 +- ...BeanWithNonPassivatingInterceptorTest.java | 3 +- .../broken/interceptor/field/Violation.java | 2 +- .../interceptor/field/ViolationProducer.java | 5 +- .../producer/field/managed/Broken_Record.java | 2 +- .../producer/field/managed/FooScoped.java | 2 +- ...onPassivationCapableProducerFieldTest.java | 4 +- .../field/managed/RecordProducer.java | 6 +- .../field/managed/dependent/British.java | 64 ++--- .../ConstructorInjectionCorralBroken.java | 11 +- .../field/managed/dependent/Corral.java | 4 +- .../producer/field/managed/dependent/Cow.java | 2 +- .../field/managed/dependent/CowProducer.java | 2 +- .../dependent/FieldInjectionCorralBroken.java | 58 ++-- .../ManagedBeanWithIllegalDependencyTest.java | 12 +- .../SetterInjectionCorralBroken.java | 8 +- .../method/managed/Broken_Record.java | 2 +- ...nPassivationCapableProducerMethodTest.java | 4 +- .../method/managed/RecordProducer.java | 6 +- .../method/managed/dependent/British.java | 76 +++--- .../ConstructorInjectionCorralBroken.java | 11 +- .../method/managed/dependent/Cow.java | 2 +- .../method/managed/dependent/CowProducer.java | 2 +- .../dependent/FieldInjectionCorralBroken.java | 56 ++-- .../method/managed/dependent/Herd.java | 7 +- .../ManagedBeanWithIllegalDependencyTest.java | 4 +- ...ducerMethodParamInjectionCorralBroken.java | 8 +- .../method/managed/dependent/Ranch.java | 2 +- .../SetterInjectionCorralBroken.java | 8 +- ...eCalledWithSerializableParametersTest.java | 2 +- .../passivating/dependency/builtin/Boss.java | 1 - .../BuiltinBeanPassivationDependencyTest.java | 17 +- .../dependency/builtin/Inspector.java | 10 +- .../producer/AnswerFieldProducer.java | 2 +- .../producer/AnswerMethodProducer.java | 2 +- .../producer/AnswerToTheUltimateQuestion.java | 2 +- ...ithPrimitiveReturnTypePassivationTest.java | 4 +- ...WithPrimitiveFieldTypePassivationTest.java | 4 +- ...NonPassivationCapableDependenciesTest.java | 6 +- .../passivating/validation/Engine.java | 2 +- .../passivating/validation/EnginePowered.java | 2 +- .../validation/EnginePoweredInterceptor.java | 6 +- .../context/passivating/validation/Ferry.java | 4 +- ...NonPassivationCapableDependenciesTest.java | 7 +- .../passivating/validation/Vessel.java | 2 +- .../validation/VesselDecorator.java | 2 +- .../decorators/AbstractDecoratorTest.java | 2 +- .../beanmanager/BeanManagerDecorator.java | 2 +- .../beanmanager/BeanManagerDecoratorTest.java | 6 +- .../decorators/builtin/beanmanager/Foo.java | 2 +- .../builtin/beanmanager/FooObserver.java | 2 +- .../BuiltinConversationDecoratorTest.java | 15 +- .../conversation/ConversationDecorator.java | 2 +- .../conversation/ConversationObserver.java | 2 +- .../event/BuiltinEventDecoratorTest.java | 16 +- .../full/decorators/builtin/event/Foo.java | 2 +- .../builtin/event/FooEventDecorator.java | 2 +- .../decorators/builtin/event/Observer.java | 2 +- .../complex/ComplexEventDecoratorTest.java | 7 +- .../BuiltinInjectionPointDecoratorTest.java | 5 +- .../BuiltinInstanceDecoratorTest.java | 14 +- .../dependent/DependentContextTest.java | 39 +-- .../context/dependent/Interior.java | 2 +- .../context/dependent/InteriorDecorator.java | 2 +- .../context/dependent/InteriorRoom.java | 2 +- .../decorators/context/dependent/Room.java | 2 +- .../context/dependent/RoomBinding.java | 2 +- .../custom/AfterBeanDiscoveryObserver.java | 2 +- .../tck/tests/full/decorators/custom/Bus.java | 2 +- .../custom/CustomDecoratorImplementation.java | 2 +- .../custom/CustomDecoratorTest.java | 5 +- .../tests/full/decorators/custom/Vehicle.java | 2 +- .../decorators/custom/VehicleDecorator.java | 2 +- .../AfterBeanDiscoveryObserver.java | 2 +- .../custom/broken/finalBeanClass/Bus.java | 2 +- .../broken/finalBeanClass/BusGarage.java | 2 +- .../CustomDecoratorImplementation.java | 2 +- ...coratorMatchingBeanWithFinalClassTest.java | 2 +- .../custom/broken/finalBeanClass/Truck.java | 2 +- .../custom/broken/finalBeanClass/Vehicle.java | 2 +- .../finalBeanClass/VehicleDecorator.java | 2 +- .../AfterBeanDiscoveryObserver.java | 2 +- .../broken/nodelegateinjectionpoint/Bus.java | 2 +- .../CustomDecorator.java | 2 +- ...ratorWithNoDelegateInjectionPointTest.java | 2 +- .../nodelegateinjectionpoint/Vehicle.java | 2 +- .../VehicleDecorator.java | 2 +- .../AfterBeanDiscoveryObserver.java | 2 +- .../toomanydelegateinjectionpoints/Bus.java | 2 +- .../CustomDecorator.java | 2 +- ...ithTooManyDelegateInjectionPointsTest.java | 2 +- .../Vehicle.java | 2 +- .../VehicleDecorator.java | 2 +- .../definition/AbstractFooDecorator.java | 4 +- .../full/decorators/definition/Account.java | 4 +- .../decorators/definition/BankAccount.java | 2 +- .../tests/full/decorators/definition/Bar.java | 4 +- .../tests/full/decorators/definition/Baz.java | 4 +- .../decorators/definition/BazDecorator1.java | 4 +- .../decorators/definition/BazDecorator2.java | 4 +- .../full/decorators/definition/Bazt.java | 4 +- .../full/decorators/definition/BaztImpl.java | 4 +- .../tests/full/decorators/definition/Boo.java | 4 +- .../definition/ChargeDecorator.java | 4 +- .../full/decorators/definition/CowShed.java | 4 +- .../definition/DecoratorDefinitionTest.java | 25 +- .../full/decorators/definition/Field.java | 4 +- .../decorators/definition/FieldDecorator.java | 4 +- .../full/decorators/definition/FieldImpl.java | 4 +- .../tests/full/decorators/definition/Foo.java | 4 +- .../full/decorators/definition/FooBar.java | 4 +- .../decorators/definition/FooBarImpl.java | 8 +- .../decorators/definition/FooDecorator.java | 8 +- .../full/decorators/definition/Logger.java | 4 +- .../full/decorators/definition/Meta.java | 2 +- .../decorators/definition/MockLogger.java | 4 +- .../full/decorators/definition/NonMeta.java | 6 +- .../definition/TimestampLogger.java | 4 +- .../DecoratorListedTwiceInBeansXmlTest.java | 3 +- .../Present.java | 2 +- .../PresentDecorator.java | 2 +- .../EnabledDecoratorNotADecoratorTest.java | 4 +- .../Logger.java | 1 - .../MockLogger.java | 4 +- .../TimestampLogger.java | 4 +- .../finalBeanClass/FinalBeanClassTest.java | 6 +- .../broken/finalBeanClass/Logger.java | 4 +- .../broken/finalBeanClass/MockLogger.java | 4 +- .../finalBeanClass/TimestampLogger.java | 4 +- .../finalBeanMethod/FinalBeanMethodTest.java | 2 +- .../broken/finalBeanMethod/Logger.java | 4 +- .../broken/finalBeanMethod/MockLogger.java | 4 +- .../finalBeanMethod/TimestampLogger.java | 4 +- .../Account.java | 2 +- .../BankAccount.java | 2 +- ...ecoratorWithInvalidAbstractMethodTest.java | 4 +- .../ThiefDecorator.java | 2 +- .../Logger.java | 4 +- .../MockLogger.java | 4 +- .../MultipleDelegateInjectionPointsTest.java | 5 +- .../TimestampLogger.java | 4 +- .../noDelegateInjectionPoints/Logger.java | 4 +- .../noDelegateInjectionPoints/MockLogger.java | 4 +- .../NoDelegateInjectionPointsTest.java | 6 +- .../TimestampLogger.java | 4 +- .../DecoratorWithNoDecoratedTypes1Test.java | 2 +- .../DecoratorWithNoDecoratedTypes2Test.java | 3 +- .../DecoratorWithNoDecoratedTypes3Test.java | 5 +- .../broken/nodecoratedtypes/NonExisting.java | 3 +- .../SerializableDecorator.java | 1 + .../ChristmasTree.java | 2 +- .../broken/nonDecoratorWithDecorates/Elf.java | 2 +- .../NonDecoratorWithDecoratesTest.java | 4 +- ...nExistantDecoratorClassInBeansXmlTest.java | 1 + .../EnhancedLogger.java | 4 +- .../Logger.java | 4 +- .../MockLogger.java | 4 +- .../NotAllDecoratedTypesImplementedTest.java | 6 +- .../TimestampLogger.java | 4 +- .../parameterized/EnhancedLogger.java | 2 +- .../parameterized/Logger.java | 3 +- .../parameterized/MockLogger.java | 2 +- .../parameterized/TimestampLogger.java | 4 +- .../TypeParametersNotTheSameTest.java | 5 +- .../DecoratorWithAsyncObserverMethodTest.java | 5 +- .../DecoratorWithObserverMethodTest.java | 7 +- .../broken/observer/FooPayload.java | 2 +- .../definition/broken/observer/Logger.java | 2 +- .../broken/observer/MockLogger.java | 2 +- .../DifferentTypeParametersTest.java | 3 +- .../Radio.java | 2 +- .../RadioDecorator.java | 2 +- .../RadioProducer.java | 2 +- .../inject/delegateConstructor/CowShed.java | 4 +- .../DelegateInjectionPointTest.java | 2 +- .../inject/delegateConstructor/Logger.java | 4 +- .../delegateConstructor/MockLogger.java | 4 +- .../delegateConstructor/TimestampLogger.java | 4 +- .../inject/delegateField/CowShed.java | 4 +- .../DelegateFieldInjectionPointTest.java | 2 +- .../inject/delegateField/Logger.java | 4 +- .../inject/delegateField/MockLogger.java | 4 +- .../inject/delegateField/TimestampLogger.java | 4 +- .../delegateInitializerMethod/CowShed.java | 4 +- .../DelegateInjectionPointTest.java | 2 +- .../delegateInitializerMethod/Logger.java | 4 +- .../delegateInitializerMethod/MockLogger.java | 4 +- .../TimestampLogger.java | 4 +- .../definition/producer/BankAccount.java | 4 +- .../definition/producer/ChargeDecorator.java | 2 +- ...ratorNotAppliedToResultOfProducerTest.java | 8 +- .../definition/producer/DurableAccount.java | 2 +- .../definition/producer/ShortTermAccount.java | 2 +- .../definition/producer/Synthetic.java | 2 +- ...lementsParameterizedDecoratedTypeTest.java | 6 +- .../definition/types/EnhancedLogger.java | 2 +- .../decorators/definition/types/Logger.java | 3 +- .../definition/types/MockLogger.java | 4 +- .../definition/types/TimestampLogger.java | 4 +- .../DecoratorAndInterceptorTest.java | 5 +- .../full/decorators/interceptor/Foo.java | 2 +- .../decorators/interceptor/FooBinding1.java | 2 +- .../decorators/interceptor/FooBinding2.java | 2 +- .../decorators/interceptor/FooDecorator1.java | 2 +- .../decorators/interceptor/FooDecorator2.java | 2 +- .../interceptor/FooInterceptor1.java | 3 +- .../interceptor/FooInterceptor2.java | 3 +- .../full/decorators/interceptor/FooStuff.java | 3 +- .../tests/full/decorators/invocation/Bar.java | 2 +- .../decorators/invocation/BarDecorator.java | 2 +- .../full/decorators/invocation/BarImpl.java | 2 +- .../full/decorators/invocation/CowShed.java | 4 +- .../invocation/DecoratorInvocationTest.java | 2 +- .../tests/full/decorators/invocation/Foo.java | 4 +- .../decorators/invocation/FooDecorator1.java | 4 +- .../decorators/invocation/FooDecorator2.java | 4 +- .../full/decorators/invocation/FooImpl.java | 4 +- .../full/decorators/invocation/Logger.java | 4 +- .../decorators/invocation/MockLogger.java | 4 +- .../invocation/TimestampLogger.java | 4 +- .../observer/DecoratorInvocationTest.java | 2 +- .../decorators/invocation/observer/Foo.java | 4 +- .../invocation/observer/Observer.java | 4 +- .../observer/ObserverDecorator.java | 4 +- .../invocation/observer/ObserverImpl.java | 4 +- .../method/DecoratorInvocationTest.java | 2 +- .../invocation/producer/method/Foo.java | 4 +- .../invocation/producer/method/Producer.java | 4 +- .../producer/method/ProducerDecorator.java | 4 +- .../producer/method/ProducerImpl.java | 4 +- .../decorator/DecoratoredBeanProxyTest.java | 25 +- .../decorator/MarineDecorator.java | 12 +- .../unproxyable/decorator/TestBean.java | 6 +- .../full/decorators/resolution/Animal.java | 2 +- .../tests/full/decorators/resolution/Bar.java | 2 +- .../decorators/resolution/BarDecorator.java | 2 +- .../full/decorators/resolution/BarImpl.java | 2 +- .../tests/full/decorators/resolution/Baz.java | 2 +- .../decorators/resolution/BazDecorator.java | 2 +- .../full/decorators/resolution/BazImpl.java | 2 +- .../full/decorators/resolution/Corge.java | 2 +- .../decorators/resolution/CorgeDecorator.java | 2 +- .../resolution/CorgeDecorator2.java | 2 +- .../full/decorators/resolution/CorgeImpl.java | 2 +- .../decorators/resolution/CorgeImpl2.java | 2 +- .../tests/full/decorators/resolution/Cow.java | 2 +- .../resolution/DecoratorResolutionTest.java | 8 +- .../resolution/FemaleFresianCow.java | 2 +- .../tests/full/decorators/resolution/Foo.java | 2 +- .../decorators/resolution/FooDecorator.java | 2 +- .../full/decorators/resolution/FooImpl.java | 2 +- .../resolution/FooObjectDecorator.java | 2 +- .../decorators/resolution/FresianCow.java | 2 +- .../full/decorators/resolution/Garply.java | 2 +- .../resolution/GarplyDecorator.java | 2 +- .../decorators/resolution/GarplyImpl.java | 2 +- .../full/decorators/resolution/Grault.java | 2 +- .../resolution/GraultExtendsDecorator.java | 2 +- .../resolution/GraultIntegerImpl.java | 2 +- .../resolution/GraultSuperDecorator.java | 2 +- .../tests/full/decorators/resolution/Qux.java | 2 +- .../decorators/resolution/QuxDecorator.java | 2 +- .../full/decorators/resolution/QuxImpl.java | 2 +- .../resolution/QuxListDecorator.java | 2 +- .../decorators/resolution/QuxListImpl.java | 2 +- .../custom/AfterBeanDiscoveryObserver.java | 10 +- .../bean/custom/AlternativeStereotype.java | 2 +- .../custom/CustomBeanImplementationTest.java | 14 +- .../bean/custom/CustomInjectionPoint.java | 7 +- .../full/definition/bean/custom/Foo.java | 4 +- .../full/definition/bean/custom/FooBean.java | 1 + .../full/definition/bean/custom/House.java | 2 +- .../definition/bean/custom/Passivable.java | 67 ++--- .../bean/custom/PassivableLiteral.java | 2 +- .../bean/custom/PassivationCapableBean.java | 3 +- .../discovery/BeanDiscoveryTest.java | 27 +- .../exclude/ExcludeFiltersTest.java | 21 +- .../full/deployment/initialization/Foo.java | 3 +- .../full/deployment/trimmed/BikeProducer.java | 2 +- .../full/deployment/trimmed/Popular.java | 1 + .../tests/full/deployment/trimmed/Segway.java | 2 +- .../deployment/trimmed/TestExtension.java | 1 + .../cdi/tck/tests/full/event/Delivery.java | 2 +- .../cdi/tck/tests/full/event/EventTest.java | 3 +- .../cdi/tck/tests/full/event/FarmShop.java | 2 +- .../jboss/cdi/tck/tests/full/event/Shop.java | 8 +- .../raw/AfterBeanDiscoveryObserver.java | 2 +- .../tck/tests/full/event/broken/raw/Bar.java | 2 +- .../tck/tests/full/event/broken/raw/Baz.java | 3 +- .../full/event/broken/raw/CustomBarBean.java | 2 +- .../broken/raw/CustomEventInjectionPoint.java | 2 +- .../raw/ProcessInjectionPointObserver.java | 2 +- .../broken/raw/RawEventCustomBeanTest.java | 2 +- .../RawEventProcessInjectionPointTest.java | 2 +- .../tests/full/event/fires/FireEventTest.java | 3 +- .../AbstractObserverNotificationTest.java | 2 +- .../full/event/observer/extension/Angry.java | 2 +- .../BeanManagerObserverNotificationTest.java | 7 +- .../EventBeanObserverNotificationTest.java | 9 +- .../event/observer/extension/Giraffe.java | 2 +- .../observer/extension/GiraffeObserver.java | 2 +- .../full/event/observer/extension/Nubian.java | 2 +- .../observer/extension/ObserverExtension.java | 5 +- .../full/event/observer/extension/Tall.java | 2 +- .../priority/EventObserverOrderingTest.java | 10 +- .../observer/priority/MoonObservers.java | 1 + .../event/observer/priority/Moonrise.java | 1 - .../observer/priority/ObserverExtension.java | 11 +- .../AfterBeanDiscoveryObserver.java | 2 +- .../AfterBeanDiscoveryTest.java | 5 +- .../afterBeanDiscovery/Cockatoo.java | 2 +- .../afterBeanDiscovery/Listener.java | 2 +- .../afterBeanDiscovery/SuperContext.java | 2 +- .../afterBeanDiscovery/SuperScoped.java | 2 +- .../annotated/ModifyingExtension.java | 6 +- ...AlternativeInLibraryWithExtensionTest.java | 7 +- .../metadata/AlternativeMetadataTest.java | 23 +- .../extensions/alternative/metadata/Bill.java | 2 +- .../alternative/metadata/Bread.java | 2 +- .../alternative/metadata/Cheap.java | 2 +- .../alternative/metadata/CheapLiteral.java | 2 +- .../alternative/metadata/Expensive.java | 2 +- .../metadata/ExpensiveLiteral.java | 2 +- .../alternative/metadata/Fruit.java | 2 +- .../alternative/metadata/Grocery.java | 6 +- .../metadata/GroceryInterceptor.java | 2 +- .../metadata/GroceryInterceptorBinding.java | 2 +- .../alternative/metadata/GroceryWrapper.java | 92 ++++--- .../alternative/metadata/MarketWrapper.java | 51 ++-- .../extensions/alternative/metadata/Milk.java | 2 +- .../alternative/metadata/NamedStereotype.java | 2 +- .../ProcessAnnotatedTypeObserver.java | 2 +- .../alternative/metadata/Sausage.java | 2 +- .../extensions/alternative/metadata/Shop.java | 2 +- .../alternative/metadata/TropicalFruit.java | 2 +- .../alternative/metadata/Vegetables.java | 4 +- .../alternative/metadata/Water.java | 2 +- .../alternative/metadata/Yogurt.java | 2 +- .../AnnotatedTypeAnnotationsTest.java | 5 +- .../annotated/ObservingExtension.java | 3 +- .../AlternativeMetadataInterceptorTest.java | 8 +- .../interceptor/InterceptorExtension.java | 1 - .../interceptor/LoginInterceptor.java | 1 - .../metadata/interceptor/Secured.java | 1 - .../full/extensions/annotated/AbstractC.java | 2 +- .../annotated/AlternativeMetaDataTest.java | 4 +- .../full/extensions/annotated/Animal.java | 2 +- .../tests/full/extensions/annotated/Cat.java | 2 +- .../full/extensions/annotated/ClassD.java | 2 +- .../tests/full/extensions/annotated/Dog.java | 2 +- .../full/extensions/annotated/DogHouse.java | 2 +- .../full/extensions/annotated/Felid.java | 2 +- .../full/extensions/annotated/InterfaceA.java | 2 +- .../full/extensions/annotated/InterfaceB.java | 2 +- .../ProcessAnnotatedTypeObserver.java | 2 +- .../annotated/ProcessAnnotatedTypeTest.java | 13 +- .../tests/full/extensions/annotated/Tame.java | 2 +- .../annotated/TestAnnotatedType.java | 7 +- .../tests/full/extensions/annotated/Type.java | 3 +- .../full/extensions/annotated/VetoedBean.java | 2 +- .../full/extensions/annotated/WildCat.java | 2 +- .../Dog.java | 2 +- ...AnnotatedTypeEventThrowsExceptionTest.java | 2 +- .../ProcessAnnotatedTypeObserver.java | 2 +- .../Dog.java | 2 +- .../InjectionTargetProcessor.java | 2 +- ...jectionTargetEventThrowsExceptionTest.java | 2 +- .../delivery/BeforeBeanDiscoveryObserver.java | 2 +- .../ProcessAnnotatedTypeObserver.java | 5 +- .../delivery/WithAnnotationsTest.java | 17 +- .../delivery/broken/ApplicationObserver.java | 2 +- .../delivery/broken/ExtensionObserver.java | 2 +- ...lContainerLifecycleEventParameterTest.java | 2 +- ...onsAppliedToIllegalEventParameterTest.java | 2 +- .../extensions/annotated/synthetic/Apple.java | 2 +- .../annotated/synthetic/AppleExtension.java | 2 +- .../extensions/annotated/synthetic/Fresh.java | 2 +- .../extensions/annotated/synthetic/Fruit.java | 2 +- .../extensions/annotated/synthetic/Juicy.java | 2 +- .../synthetic/ModifyingExtension.java | 2 +- .../annotated/synthetic/Orange.java | 2 +- .../extensions/annotated/synthetic/Pear.java | 2 +- .../annotated/synthetic/Plants.java | 2 +- .../ProcessSyntheticAnnotatedTypeTest.java | 13 +- .../RegisteringAnnotationExtension.java | 5 +- .../synthetic/RegisteringExtension1.java | 2 +- .../synthetic/RegisteringExtension2.java | 2 +- .../synthetic/RegisteringExtension3.java | 12 +- .../annotated/synthetic/TestAnnotation.java | 2 +- .../annotated/synthetic/Vegetables.java | 9 +- .../synthetic/VerifyingExtension.java | 5 +- .../ordering/LifecycleEventOrderingTest.java | 4 +- .../AfterBeanDiscoveryObserver.java | 2 +- .../beanManager/AnimalStereotype.java | 8 +- .../beanManager/BeanManagerTest.java | 28 +- .../full/extensions/beanManager/Cow.java | 2 +- .../full/extensions/beanManager/CowBean.java | 14 +- .../extensions/beanManager/DerivedBean.java | 2 +- .../full/extensions/beanManager/Dog.java | 2 +- .../full/extensions/beanManager/DogHouse.java | 2 +- .../extensions/beanManager/DummyContext.java | 6 +- .../extensions/beanManager/DummyScoped.java | 6 +- .../beanManager/InjectionPointDecorator.java | 10 +- .../beanManager/PassivationIdTest.java | 7 +- .../extensions/beanManager/SimpleBean.java | 2 +- .../full/extensions/beanManager/Tame.java | 6 +- .../full/extensions/beanManager/Terrier.java | 2 +- .../extensions/beanManager/Transactional.java | 8 +- .../beanManager/UnregisteredExtension.java | 2 +- .../beanManager/bean/BeanExtension.java | 4 +- .../extensions/beanManager/bean/Building.java | 2 +- .../extensions/beanManager/bean/Employee.java | 2 +- .../beanManager/bean/FireTruck.java | 2 +- .../extensions/beanManager/bean/Hungry.java | 2 +- .../extensions/beanManager/bean/Large.java | 2 +- .../extensions/beanManager/bean/Lion.java | 2 +- .../extensions/beanManager/bean/Office.java | 2 +- .../beanManager/bean/SerializableOffice.java | 2 +- .../extensions/beanManager/bean/Simple.java | 2 +- .../beanManager/bean/SimpleInterceptor.java | 2 +- .../beanManager/bean/SyntheticBeanTest.java | 4 +- .../extensions/beanManager/bean/Tiger.java | 2 +- .../extensions/beanManager/bean/Vehicle.java | 4 +- .../beanManager/bean/VehicleDecorator.java | 2 +- .../full/extensions/beanManager/bean/Zoo.java | 2 +- .../beanManager/beanAttributes/Animal.java | 2 +- .../CreateBeanAttributesTest.java | 1 - .../beanManager/beanAttributes/Fish.java | 2 +- .../beanAttributes/InvalidBeanType.java | 2 +- .../beanManager/beanAttributes/Landmark.java | 2 +- .../beanManager/beanAttributes/Mountain.java | 2 +- .../beanManager/beanAttributes/Natural.java | 2 +- .../beanAttributes/TundraStereotype.java | 2 +- .../beanManager/beanAttributes/WaterBody.java | 2 +- .../beanManager/beanAttributes/Wild.java | 2 +- .../bootstrap/unavailable/methods/Foo.java | 4 +- .../unavailable/methods/Transactional.java | 8 +- ...dsDuringApplicationInitializationTest.java | 10 +- .../unavailable/methods/WrongExtension.java | 17 +- .../FireContainerLifecycleEventTest.java | 4 +- .../beanManager/el/DummyMethodExpression.java | 2 +- .../beanManager/el/DummyValueExpression.java | 2 +- .../full/extensions/beanManager/el/Foo.java | 2 +- .../el/WrapExpressionFactoryTest.java | 5 +- .../InterceptorBindingEquivalenceTest.java | 2 +- .../equivalence/interceptorbinding/Level.java | 3 +- .../interceptorbinding/Missile.java | 2 +- .../equivalence/qualifier/Level.java | 3 +- .../qualifier/QualifierEquivalenceTest.java | 2 +- .../beanManager/injectionPoint/Book.java | 2 +- .../CreateInjectionPointTest.java | 4 +- .../beanManager/injectionPoint/Fictional.java | 2 +- .../beanManager/injectionPoint/Library.java | 2 +- .../beanManager/injectionPoint/Magazine.java | 2 +- .../beanManager/injectionPoint/Monograph.java | 2 +- .../beanManager/injectionPoint/NotABean.java | 2 +- .../beanManager/unmanaged/Elephant.java | 2 +- .../beanManager/unmanaged/Hammer.java | 2 +- .../beanManager/unmanaged/ToolBinding.java | 2 +- .../beanManager/unmanaged/broken/House.java | 2 +- .../full/extensions/communication/Baz.java | 2 +- .../extensions/communication/EventBase.java | 2 +- .../communication/ExtensionAlpha.java | 2 +- .../communication/ExtensionBeta.java | 3 +- .../extensions/communication/PatEvent.java | 2 +- .../extensions/communication/PbEvent.java | 2 +- .../DummyConfiguringExtension.java | 3 +- .../full/extensions/configurators/Foo.java | 2 +- .../AnimalShelter.java | 4 +- .../AnnotatedTypeConfiguratorTest.java | 48 ++-- .../annotatedTypeConfigurator/Cats.java | 2 +- .../Countryside.java | 2 +- .../DogDependenciesProducer.java | 8 +- .../DogProducer.java | 2 +- .../ProcessAnnotatedTypeObserver.java | 48 ++-- .../annotatedTypeConfigurator/Wild.java | 1 + .../AnnotatedTypeConfiguratorInBBDTest.java | 6 +- .../BBDObservingExtension.java | 4 +- .../beforeBeanDiscovery/CustomBinding.java | 5 +- .../beforeBeanDiscovery/CustomQualifier.java | 3 +- .../beforeBeanDiscovery/Foo.java | 4 +- .../beforeBeanDiscovery/FooInterceptor.java | 4 +- .../bean/BeanConfiguratorTest.java | 13 +- .../configurators/bean/Dangerous.java | 8 +- .../bean/DesireToHurtHumans.java | 5 +- .../configurators/bean/Dungeon.java | 21 +- .../extensions/configurators/bean/Ghost.java | 15 +- .../configurators/bean/LifecycleObserver.java | 7 +- .../configurators/bean/Monster.java | 2 +- .../configurators/bean/MonsterController.java | 2 +- .../configurators/bean/Skeleton.java | 14 +- .../extensions/configurators/bean/Undead.java | 8 +- .../configurators/bean/Vampire.java | 11 +- .../extensions/configurators/bean/Weapon.java | 5 +- .../extensions/configurators/bean/Zombie.java | 13 +- .../AlternativePriorityExtension.java | 29 +- ...anConfiguratorAlternativePriorityTest.java | 11 +- .../configurators/beanAttributes/Axe.java | 2 +- .../BeanAttributesConfiguratorTest.java | 19 +- .../configurators/beanAttributes/Hoe.java | 2 +- .../configurators/beanAttributes/Melee.java | 2 +- .../ProcessBeanAttributesObserver.java | 3 +- .../beanAttributes/Reforged.java | 4 +- .../configurators/beanAttributes/Sword.java | 3 +- .../configurators/beanAttributes/Tool.java | 2 +- .../beanAttributes/UsableItem.java | 2 +- .../configurators/beanAttributes/Weapon.java | 2 +- .../injectionPoint/AirPlane.java | 2 +- .../configurators/injectionPoint/Engine.java | 1 - .../injectionPoint/Helicopter.java | 2 +- .../InjectionPointConfiguratorTest.java | 4 +- .../InjectionTargetFactoryConfigureTest.java | 6 +- .../IoCForFramework.java | 9 +- .../invalid/ConfigureAndSetExtension.java | 10 +- .../invalid/TestAnnotatedType.java | 3 +- .../AfterBeanDiscoveryObserver.java | 5 +- .../observerMethod/FruitObserver.java | 4 +- .../ObserverMethodConfiguratorTest.java | 32 ++- .../ProcessObserverMethodObserver.java | 1 + .../producer/ProducerConfiguratorTest.java | 7 +- .../AddDefinitionErrorTest.java | 2 +- .../ProcessBeanObserver.java | 2 +- .../Sheep.java | 2 +- .../ProcessBeanObserver.java | 2 +- .../Sheep.java | 2 +- ...rowExceptionInProcessBeanObserverTest.java | 2 +- .../interceptionFactory/Custom.java | 1 + .../interceptionFactory/FinalProduct.java | 2 +- .../InterceptionFactoryTest.java | 12 +- .../ProductInterceptor1.java | 2 +- .../ProductInterceptor2.java | 2 +- .../ProductInterceptor3.java | 2 +- .../ProductInterceptorBinding1.java | 1 + .../ProductInterceptorBinding2.java | 1 + .../ProductInterceptorBinding3.java | 1 + .../interceptionFactory/ProductProducer.java | 3 +- .../broken/BeanWithInvalidInjectionPoint.java | 5 +- .../broken/InterceptedInstanceProducer.java | 3 +- ...InterceptionFactoryInjectionPointTest.java | 3 +- .../broken/UnproxyableType.java | 2 +- .../customBean/Account.java | 4 +- .../AfterBeanDiscoveryObserver.java | 2 +- .../customBean/Custom.java | 1 + .../CustomBeanWithInterceptorTest.java | 3 +- .../customBean/FeeBinding.java | 3 +- .../annotation/BooInterceptor.java | 2 +- .../annotation/InterceptorsExtension.java | 1 - .../interceptors/annotation/SimpleBean.java | 1 - .../custom/AbstractInterceptor.java | 4 +- .../custom/CustomInterceptor.java | 2 +- .../CustomInterceptorInvocationTest.java | 8 +- .../CustomInterceptorRegistrationTest.java | 5 +- .../interceptors/custom/FooInterceptor.java | 4 +- .../custom/FooInterceptorBinding.java | 3 +- .../lifecycle/ExtensionLifecycleTest.java | 2 +- .../atd/AfterTypeDiscoveryObserver.java | 12 +- .../lifecycle/atd/AfterTypeDiscoveryTest.java | 27 +- .../lifecycle/atd/AlphaDecorator.java | 2 - .../lifecycle/atd/BravoDecorator.java | 2 - .../lifecycle/atd/BravoInterceptor.java | 1 - .../lifecycle/atd/CharlieDecorator.java | 2 - .../lifecycle/atd/CharlieInterceptor.java | 1 - .../lifecycle/atd/DeltaAlternative.java | 2 +- .../lifecycle/atd/DeltaAlternativeBean.java | 9 +- .../lifecycle/atd/DeltaDecorator.java | 2 +- .../lifecycle/atd/DeltaDecoratorBean.java | 13 +- .../lifecycle/atd/DeltaInterceptorBean.java | 13 +- .../lifecycle/atd/EchoAlternative.java | 2 +- .../extensions/lifecycle/atd/Monitored.java | 13 +- .../extensions/lifecycle/atd/lib/Baz.java | 3 +- .../extensions/lifecycle/atd/lib/Pro.java | 77 +++--- .../AfterTypeDiscoveryMassOperationsTest.java | 26 +- .../atd/massOperations/BetaAlternative.java | 2 +- .../atd/massOperations/GammaAlternative.java | 2 +- .../atd/massOperations/GammaInterceptor.java | 2 +- .../extensions/lifecycle/bbd/Alligator.java | 4 +- .../bbd/BeforeBeanDiscoveryObserver.java | 7 +- .../bbd/BeforeBeanDiscoveryTest.java | 7 +- .../extensions/lifecycle/bbd/DataAccess.java | 2 +- .../bbd/DataAccessAuthorizationDecorator.java | 2 +- .../lifecycle/bbd/DataAccessImpl.java | 4 +- .../lifecycle/bbd/DeploymentTest.java | 7 +- .../lifecycle/bbd/DisabledBean.java | 2 +- .../extensions/lifecycle/bbd/EpochScoped.java | 2 +- .../lifecycle/bbd/Interceptor1.java | 2 +- .../lifecycle/bbd/InterceptorType1.java | 2 +- .../lifecycle/bbd/ManagerObserver.java | 96 +++---- .../lifecycle/bbd/NotAuthorizedException.java | 2 +- .../extensions/lifecycle/bbd/Programmer.java | 2 +- .../extensions/lifecycle/bbd/RomanEmpire.java | 4 +- .../full/extensions/lifecycle/bbd/Skill.java | 8 +- .../lifecycle/bbd/SkillLiteral.java | 2 +- .../full/extensions/lifecycle/bbd/Tame.java | 68 ++--- .../full/extensions/lifecycle/bbd/User.java | 2 +- .../BeforeBeanDiscoveryObserver.java | 4 +- ...eforeBeanDiscoveryThrowsExceptionTest.java | 2 +- .../normalScope/AddingNormalScopeTest.java | 7 +- .../BeforeBeanDiscoveryObserver.java | 4 +- .../bbd/broken/normalScope/Caesar.java | 2 +- .../bbd/broken/normalScope/EpochScoped.java | 2 +- .../bbd/broken/normalScope/RomanEmpire.java | 4 +- .../AddingPassivatingScopeTest.java | 8 +- .../BeforeBeanDiscoveryObserver.java | 4 +- .../broken/passivatingScope/EpochScoped.java | 2 +- .../broken/passivatingScope/RomanEmpire.java | 4 +- .../extensions/lifecycle/bbd/lib/Baz.java | 2 +- .../extensions/lifecycle/bbd/lib/Pro.java | 76 +++--- .../AddDefinitionErrorTest.java | 7 +- .../AfterBeanDiscoveryObserver.java | 52 ++-- .../AddDeploymentProblemTest.java | 4 +- .../AfterDeploymentValidationObserver.java | 52 ++-- ...DiscoveryObserverExecutionFailureTest.java | 4 +- .../discovery/BeanDiscoveryObserver.java | 48 ++-- .../exception/discovery/FooException.java | 8 +- ...alidationObserverExecutionFailureTest.java | 4 +- .../validation/ValidationObserver.java | 48 ++-- .../AfterBeanDiscoveryObserver.java | 71 +++-- ...ObserverMethodWithoutNotifyMethodTest.java | 4 +- .../broken/observerMethod/FooObserver.java | 2 +- ...ObserverMethodWithoutNotifyMethodTest.java | 3 +- .../processBeanAttributes/Alpha.java | 2 +- .../processBeanAttributes/AlphaQualifier.java | 2 +- .../AlphaStereotype.java | 2 +- .../processBeanAttributes/Bravo.java | 2 +- .../processBeanAttributes/BravoDecorator.java | 2 +- .../BravoInterceptor.java | 2 +- .../BravoInterceptorBinding.java | 2 +- .../processBeanAttributes/BravoInterface.java | 2 +- .../processBeanAttributes/BravoProducer.java | 2 +- .../processBeanAttributes/BravoQualifier.java | 2 +- .../processBeanAttributes/Charlie.java | 2 +- .../CharlieInterface.java | 2 +- .../CharlieProducer.java | 2 +- .../CharlieQualifier.java | 2 +- .../lifecycle/processBeanAttributes/Mike.java | 2 +- .../VerifyValuesTest.java | 26 +- .../VerifyingExtension.java | 2 +- .../broken/AddDefinitionErrorExtension.java | 2 +- .../broken/AddDefinitionErrorTest.java | 2 +- .../broken/BrokenException.java | 2 +- .../processBeanAttributes/broken/Duke.java | 2 +- .../broken/ThrowExceptionExtension.java | 2 +- .../broken/ThrowExceptionTest.java | 2 +- .../invalid/InvalidQualifierExtension.java | 2 +- .../broken/invalid/InvalidQualifierTest.java | 3 +- .../broken/invalid/InvalidScopeExtension.java | 2 +- .../broken/invalid/InvalidScopeTest.java | 4 +- .../invalid/InvalidStereotypeExtension.java | 4 +- .../broken/invalid/InvalidStereotypeTest.java | 4 +- .../broken/invalid/InvalidTypesExtension.java | 2 +- .../broken/invalid/InvalidTypesTest.java | 4 +- .../broken/invalid/PlainOldAnnotation.java | 2 +- .../broken/invalid/Telephone.java | 2 +- .../broken/passivation/Bicycle.java | 2 +- .../passivation/ModifyingExtension1.java | 2 +- .../passivation/ModifyingExtension2.java | 2 +- .../PassivationCapabilityErrorTest.java | 4 +- .../broken/passivation/Wheel.java | 2 +- .../decorator/Alpha.java | 2 +- .../decorator/AlphaDecorator.java | 2 +- .../decorator/Bravo.java | 2 +- .../decorator/BravoDecorator.java | 2 +- .../decorator/Charlie.java | 2 +- .../DecoratorProcessBeanAttributesTest.java | 2 +- .../decorator/VerifyingExtension.java | 2 +- .../ignoreFinalMethods/IgnoringExtension.java | 2 +- .../ignoreFinalMethods/Qux.java | 4 +- .../interceptor/AlphaInterceptor.java | 2 +- .../interceptor/AlphaInterceptorBinding.java | 2 +- .../interceptor/BravoInterceptor.java | 2 +- .../interceptor/BravoInterceptorBinding.java | 2 +- .../InterceptorProcessBeanAttributesTest.java | 5 +- .../interceptor/VerifyingExtension.java | 2 +- .../processBeanAttributes/modify/Animal.java | 2 +- .../processBeanAttributes/modify/Cute.java | 2 +- .../modify/PersianStereotype.java | 2 +- .../modify/SetBeanAttributesTest.java | 6 +- .../processBeanAttributes/modify/Wild.java | 2 +- .../specialization/Alpha.java | 2 +- .../specialization/Bar.java | 2 +- .../specialization/Baz.java | 2 +- .../specialization/Bravo.java | 2 +- .../specialization/Charlie.java | 2 +- .../specialization/Foo.java | 2 +- .../specialization/SpecializationTest.java | 7 +- .../specialization/VerifyingExtension.java | 2 +- .../specialization/VetoTest.java | 10 +- .../specialization/VetoingExtension.java | 2 +- .../specialization/broken/Specialized.java | 2 +- .../specialization/broken/Specializing.java | 2 +- .../broken/TypeConflictDetectionTest.java | 14 +- .../specialization/broken/TypeExtension.java | 2 +- ...ttributesNotFiredForSyntheticBeanTest.java | 3 +- .../synthetic/Vehicle.java | 2 +- .../processBeanAttributes/veto/Car.java | 2 +- .../processBeanAttributes/veto/Factory.java | 2 +- .../processBeanAttributes/veto/Field.java | 6 +- .../processBeanAttributes/veto/Flower.java | 2 +- .../processBeanAttributes/veto/VetoTest.java | 4 +- .../veto/VetoingExtension.java | 2 +- .../processBeanAttributes/veto/Wheat.java | 2 +- .../processInjectionPoint/Alpha.java | 2 +- .../lifecycle/processInjectionPoint/Bar.java | 2 +- .../processInjectionPoint/Bravo.java | 2 +- .../processInjectionPoint/Charlie.java | 2 +- .../lifecycle/processInjectionPoint/Foo.java | 2 +- .../processInjectionPoint/InjectingBean.java | 6 +- .../PlainAnnotation.java | 2 +- .../ProcessInjectionPointFiredTest.java | 25 +- .../processInjectionPoint/ProducedBean.java | 2 +- .../VerifyingExtension.java | 1 - .../broken/AddDefinitionErrorExtension.java | 2 +- .../broken/AddDefinitionErrorTest.java | 2 +- .../broken/BrokenException.java | 2 +- .../processInjectionPoint/broken/Duke.java | 2 +- .../broken/ThrowExceptionExtension.java | 2 +- .../broken/ThrowExceptionTest.java | 2 +- .../processInjectionPoint/broken/World.java | 2 +- .../processInjectionPoint/modify/Animal.java | 2 +- .../modify/AnimalDecorator.java | 2 +- .../processInjectionPoint/modify/Dog.java | 2 +- .../processInjectionPoint/modify/Fast.java | 2 +- .../processInjectionPoint/modify/Hound.java | 2 +- .../modify/InjectingBean.java | 2 +- .../modify/InjectionPointOverridingTest.java | 10 +- .../processInjectionPoint/modify/Lazy.java | 2 +- .../modify/ModifyingExtension.java | 2 +- .../BuildCompatibleExtensionSmokeTest.java | 2 - .../full/extensions/observer/EventA.java | 2 +- .../observer/EventBObserverMethod.java | 2 +- .../extensions/observer/EventObserver.java | 2 +- .../ProcessObserverMethodEventTest.java | 18 +- .../ProcessObserverMethodObserver.java | 2 +- .../broken/definitionError/EventB.java | 2 +- .../definitionError/EventBObserver.java | 2 +- .../ProcessObserverMethodErrorTest.java | 4 +- .../ProcessObserverMethodObserver.java | 4 +- .../observer/broken/exception/EventC.java | 2 +- .../broken/exception/EventCObserver.java | 2 +- .../ProcessObserverMethodExceptionTest.java | 4 +- .../ProcessObserverMethodObserver.java | 4 +- .../ExtensionObserverOrderingTest.java | 4 +- .../full/extensions/processBean/Cat.java | 2 +- .../processBean/CatInterceptorBinding.java | 5 +- .../full/extensions/processBean/Chicken.java | 2 +- .../extensions/processBean/ChickenHutch.java | 2 +- .../full/extensions/processBean/Cow.java | 2 +- .../full/extensions/processBean/Cowshed.java | 2 +- .../processBean/ProcessBeanTest.java | 18 +- .../tests/full/extensions/producer/Bird.java | 2 +- .../full/extensions/producer/BirdCage.java | 2 +- .../producer/CanSpeakDecorator.java | 8 +- .../tests/full/extensions/producer/Cat.java | 8 +- .../full/extensions/producer/CatFoodDish.java | 2 +- .../full/extensions/producer/CatHolder.java | 5 +- .../producer/CatHolderInterceptor.java | 2 +- .../extensions/producer/CatInterceptor.java | 2 +- .../extensions/producer/CatSpectator.java | 7 +- .../producer/CheckableInjectionTarget.java | 2 +- .../tests/full/extensions/producer/Cow.java | 2 +- .../full/extensions/producer/CowProducer.java | 2 +- .../tests/full/extensions/producer/Dog.java | 2 +- .../full/extensions/producer/DogBed.java | 2 +- .../full/extensions/producer/DogBone.java | 2 +- .../full/extensions/producer/DogProducer.java | 2 +- .../full/extensions/producer/LitterBox.java | 2 +- .../tests/full/extensions/producer/Noisy.java | 2 +- .../full/extensions/producer/Preferred.java | 2 +- .../producer/ProducerProcessor.java | 2 +- .../extensions/producer/ProducerTest.java | 42 +-- .../tests/full/extensions/producer/Quiet.java | 2 +- .../tests/full/extensions/producer/Tabby.java | 2 +- .../broken/injectionTargetError/Dog.java | 2 +- .../injectionTargetError/EventProcessor.java | 2 +- .../InjectionTargetDefinitionErrorTest.java | 4 +- .../ExplicitDefinitionErrorExtension.java | 4 +- .../ExplicitExceptionExtension.java | 4 +- .../producer/broken/processing/Gold.java | 3 +- .../broken/processing/GoldProducer.java | 2 +- ...ucerProcessingWithDefinitionErrorTest.java | 4 +- .../ProducerProcessingWithExceptionTest.java | 4 +- .../full/extensions/stereotype/Chair.java | 2 +- .../stereotype/StereotypeCandidate.java | 2 +- .../stereotype/StereotypeExtension.java | 1 - .../metadata/BuiltinMetadataBeanTest.java | 16 +- .../builtin/metadata/Frozen.java | 2 +- .../builtin/metadata/Fruit.java | 2 +- .../builtin/metadata/MilkProduct.java | 2 +- .../metadata/MilkProductDecorator.java | 2 +- .../builtin/metadata/Probiotic.java | 2 +- .../builtin/metadata/Yoghurt.java | 2 +- .../builtin/metadata/YoghurtInterceptor.java | 2 +- .../metadata/broken/injection/Bar.java | 2 +- .../BuiltinDecoratorInjectionTest.java | 2 +- ...DecoratedBeanConstructorInjectionTest.java | 2 +- .../DecoratedBeanFieldInjectionTest.java | 2 +- ...DecoratedBeanInitializerInjectionTest.java | 2 +- .../DecoratorTypeParamConstructorTest.java | 2 +- .../DecoratorTypeParamFieldTest.java | 2 +- .../DecoratorTypeParamInitializerTest.java | 2 +- ...coratoredBeanTypeParamConstructorTest.java | 2 +- .../DecoratoredBeanTypeParamFieldTest.java | 2 +- ...coratoredBeanTypeParamInitializerTest.java | 2 +- .../MilkDecoratedBeanConstructor.java | 2 +- .../decorator/MilkDecoratedBeanField.java | 2 +- .../MilkDecoratedBeanInitializer.java | 2 +- .../decorator/MilkDecoratorConstructor.java | 2 +- .../decorator/MilkDecoratorField.java | 2 +- .../decorator/MilkDecoratorInitializer.java | 2 +- .../definition/broken/decorator/Bar.java | 2 +- .../DisposerMethodOnDecoratorTest.java | 3 +- .../definition/broken/decorator/Foo.java | 2 +- .../broken/decorator/FooDecorator_Broken.java | 2 +- .../definition/broken/decorator/Bar.java | 2 +- .../definition/broken/decorator/Foo.java | 2 +- .../broken/decorator/FooDecorator_Broken.java | 2 +- .../ProducerFieldOnDecoratorTest.java | 2 +- .../producer/field/lifecycle/Animal.java | 36 +-- .../field/lifecycle/DeadlyAnimal.java | 36 +-- .../field/lifecycle/DeadlySpider.java | 36 +-- .../field/lifecycle/DefangedTarantula.java | 36 +-- .../SpecializedTarantulaProducer.java | 6 +- .../producer/field/lifecycle/Spider.java | 48 ++-- .../producer/field/lifecycle/Tame.java | 68 ++--- .../producer/field/lifecycle/Tarantula.java | 36 +-- .../field/lifecycle/TarantulaConsumer.java | 6 +- .../field/lifecycle/TarantulaProducer.java | 2 +- .../producer/method/broken/decorator/Bar.java | 2 +- .../producer/method/broken/decorator/Foo.java | 2 +- .../broken/decorator/FooDecorator_Broken.java | 2 +- .../ProducerMethodOnDecoratorTest.java | 3 +- .../method/definition/AndalusianChicken.java | 2 +- .../producer/method/definition/Chicken.java | 2 +- .../producer/method/definition/Egg.java | 2 +- .../ProducerMethodDefinitionTest.java | 6 +- .../producer/method/definition/Yummy.java | 72 ++--- .../producer/method/lifecycle/Animal.java | 36 +-- .../method/lifecycle/DeadlyAnimal.java | 36 +-- .../method/lifecycle/DeadlySpider.java | 36 +-- .../producer/method/lifecycle/Null.java | 68 ++--- .../producer/method/lifecycle/Pet.java | 8 +- .../lifecycle/PreferredSpiderProducer.java | 206 +++++++------- .../ProducerMethodLifecycleTest.java | 4 +- .../producer/method/lifecycle/Spider.java | 36 +-- .../method/lifecycle/SpiderProducer.java | 3 +- .../producer/method/lifecycle/Tarantula.java | 72 ++--- .../producer/method/lifecycle/Web.java | 2 +- .../simple/lifecycle/Bream.java | 4 +- .../implementation/simple/lifecycle/Lion.java | 2 +- .../simple/lifecycle/MountainLion.java | 2 +- .../lifecycle/SimpleBeanLifecycleTest.java | 6 +- .../implementation/simple/lifecycle/Tame.java | 2 +- .../producer/method/Expensive.java | 72 ++--- .../producer/method/JewelryShop.java | 2 +- .../producer/method/Necklace.java | 2 +- .../ProducerMethodSpecializationTest.java | 9 +- .../producer/method/Product.java | 2 +- .../specialization/producer/method/Shop.java | 2 +- .../producer/method/Sparkly.java | 72 ++--- .../broken/indirectoverride/Expensive.java | 68 ++--- .../IndirectOverrideTest.java | 2 +- .../broken/indirectoverride/MallShop.java | 2 +- .../broken/indirectoverride/Product.java | 2 +- .../indirectoverride/ShoeShop_Broken.java | 2 +- .../method/broken/indirectoverride/Shop.java | 2 +- .../method/broken/name/HighSchool_Broken.java | 2 +- .../producer/method/broken/name/Pupil.java | 2 +- .../producer/method/broken/name/School.java | 2 +- ...alizingAndSpecializedBeanHaveNameTest.java | 2 +- .../method/broken/staticmethod/Expensive.java | 68 ++--- .../staticmethod/FurnitureShop_Broken.java | 2 +- .../method/broken/staticmethod/Product.java | 2 +- .../method/broken/staticmethod/Shop.java | 2 +- .../SpecializesStaticMethodTest.java | 2 +- .../broken/twobeans/Bookshop_Broken.java | 2 +- .../method/broken/twobeans/Expensive.java | 68 ++--- .../broken/twobeans/PictureShop_Broken.java | 2 +- .../method/broken/twobeans/Product.java | 2 +- .../producer/method/broken/twobeans/Shop.java | 2 +- .../TwoBeansSpecializeTheSameBeanTest.java | 2 +- .../qualifiers/DataProviderProducer.java | 7 +- .../specialization/qualifiers/Mock.java | 2 +- .../SpecializingBeanQualifiersTest.java | 3 +- .../specialization/simple/Animal.java | 36 +-- .../specialization/simple/Building.java | 2 +- .../specialization/simple/Egg.java | 2 +- .../specialization/simple/Farmer.java | 2 +- .../specialization/simple/Human.java | 2 +- .../specialization/simple/Landowner.java | 72 ++--- .../specialization/simple/Lazy.java | 72 ++--- .../specialization/simple/LazyFarmer.java | 2 +- .../specialization/simple/Office.java | 2 +- .../simple/SimpleBeanSpecializationTest.java | 12 +- .../specialization/simple/Waste.java | 2 +- .../simple/broken/inconsistent/Employee.java | 2 +- .../InconsistentSpecializationTest.java | 2 +- .../simple/broken/inconsistent/Maid.java | 2 +- .../simple/broken/inconsistent/Manager.java | 2 +- .../simple/broken/names/FarmYard_Broken.java | 2 +- ...ializingAndSpecializedBeanHasNameTest.java | 2 +- .../simple/broken/names/Yard.java | 2 +- .../simple/broken/noextend1/Animal.java | 36 +-- .../broken/noextend1/Donkey_Broken.java | 2 +- ...lizingBeanImplementsInterfaceOnlyTest.java | 2 +- .../simple/broken/noextend2/Cow_Broken.java | 2 +- .../SpecializingBeanExtendsNothingTest.java | 2 +- .../simple/broken/noextend3/Cow_Broken.java | 2 +- .../simple/broken/noextend3/Mammal.java | 2 +- ...ializingClassExtendsNonSimpleBeanTest.java | 2 +- .../simple/broken/types/Bar.java | 2 +- .../simple/broken/types/Baz.java | 2 +- .../simple/broken/types/Foo.java | 2 +- ...nWithoutBeanTypeOfSpecializedBeanTest.java | 4 +- .../contract/invocationContext/Dog.java | 1 - .../invocationContext/DogInterceptor.java | 6 +- .../invocationContext/FishInterceptor.java | 6 +- ...rceptorBindingsWithAtInterceptorsTest.java | 12 +- ...torBindingsWithInterceptorFactoryTest.java | 6 +- .../ProductInterceptor1.java | 8 +- .../ProductInterceptor2.java | 8 +- .../ProductInterceptorBinding1.java | 8 +- .../ProductInterceptorBinding2.java | 6 +- .../ProductInterceptorBinding3.java | 6 +- .../lifecycleCallback/wrapped/Bar.java | 2 +- .../lifecycleCallback/wrapped/Bird.java | 2 +- .../lifecycleCallback/wrapped/Eagle.java | 2 +- .../Automobile.java | 2 +- .../InterceptingDecorator.java | 2 +- .../InterceptorCanNotBeDecoratorTest.java | 2 +- .../NonExistantClassInBeansXmlTest.java | 1 + .../nonInterceptorClassInBeansXml/Foo.java | 2 +- .../FordInterceptor.java | 2 +- .../SameClassListedTwiceInBeansXmlTest.java | 1 + .../Transactional.java | 2 +- .../InterceptorConflictingEnablementTest.java | 7 +- .../conflictingenablement/Logged.java | 1 + .../conflictingenablement/Transactional.java | 1 + .../custom/AfterBeanDiscoveryObserver.java | 2 +- .../CustomInterceptorImplementation.java | 6 +- .../custom/CustomInterceptorTest.java | 18 +- .../definition/custom/Secure.java | 2 +- .../definition/custom/SecureLiteral.java | 2 +- .../SimpleInterceptorWithoutAnnotations.java | 2 +- .../definition/custom/Transactional.java | 2 +- .../custom/TransactionalLiteral.java | 2 +- .../FooDecorator.java | 2 +- .../TransactionInterceptor.java | 2 +- .../AccountHolder.java | 2 +- .../TransactionInterceptor.java | 2 +- .../Transactional.java | 2 +- .../interceptorOrder/AccountBinding.java | 6 +- .../interceptorOrder/AccountTransaction.java | 2 +- .../interceptorOrder/AnotherInterceptor.java | 3 +- .../interceptorOrder/FirstInterceptor.java | 5 +- .../definition/interceptorOrder/Foo.java | 2 +- .../InterceptorOrderTest.java | 20 +- .../interceptorOrder/SecondInterceptor.java | 3 +- .../definition/interceptorOrder/Secure.java | 12 +- .../interceptorOrder/Transaction.java | 1 + .../interceptorOrder/Transactional.java | 2 +- .../TransactionalInterceptor.java | 5 +- .../lifecycle/order/AccountTransaction.java | 2 +- .../lifecycle/order/AnotherInterceptor.java | 2 +- .../order/LifecycleInterceptorOrderTest.java | 5 +- .../lifecycle/order/Transaction.java | 2 +- .../lifecycle/order/Transactional.java | 2 +- .../order/TransactionalInterceptor.java | 2 +- .../lifecycleCallback/wrapped/Bird.java | 2 +- .../lifecycleCallback/wrapped/Eagle.java | 2 +- .../lifecycleCallback/wrapped/Falcon.java | 2 +- .../tests/contract/method/Dog.java | 2 +- .../tests/contract/method/DogInterceptor.java | 2 +- .../tests/contract/method/Fish.java | 2 +- .../contract/method/FishInterceptor.java | 2 +- .../method/MethodLevelInterceptorTest.java | 4 +- .../full/invokers/SimpleInvokerTest.java | 17 +- .../invalid/DecoratorInvokerTest.java | 5 +- .../full/lookup/byname/AlaskaPlaice.java | 2 +- .../tck/tests/full/lookup/byname/Animal.java | 36 +-- .../cdi/tck/tests/full/lookup/byname/Cod.java | 2 +- .../tck/tests/full/lookup/byname/Plaice.java | 2 +- .../lookup/byname/ResolutionByNameTest.java | 8 +- .../tck/tests/full/lookup/byname/Salmon.java | 2 +- .../tck/tests/full/lookup/byname/Sole.java | 2 +- .../tests/full/lookup/byname/Whitefish.java | 68 ++--- .../raw/AfterBeanDiscoveryObserver.java | 2 +- .../full/lookup/dynamic/broken/raw/Bar.java | 2 +- .../full/lookup/dynamic/broken/raw/Baz.java | 2 +- .../dynamic/broken/raw/CustomBarBean.java | 2 +- .../raw/CustomInstanceInjectionPoint.java | 2 +- .../raw/ProcessInjectionPointObserver.java | 3 +- .../broken/raw/RawInstanceCustomBeanTest.java | 5 +- .../RawInstanceProcessInjectionPointTest.java | 2 +- .../destroy/normal/AbstractContext.java | 26 +- .../destroy/normal/AlterableScoped.java | 4 +- .../normal/CustomAlterableContext.java | 14 +- .../DestroyingNormalScopedInstanceTest.java | 94 ++++--- .../destroy/normal/NonAlterableComponent.java | 2 - .../destroy/normal/NonAlterableScoped.java | 4 +- .../cdi/tck/tests/full/lookup/el/Counter.java | 2 +- .../cdi/tck/tests/full/lookup/el/Game.java | 2 +- .../full/lookup/el/ResolutionByNameTest.java | 18 +- .../cdi/tck/tests/full/lookup/el/Salmon.java | 2 +- .../cdi/tck/tests/full/lookup/el/Tuna.java | 2 +- .../tck/tests/full/lookup/el/TunaFarm.java | 2 +- .../injection/visibility/AbstractBean.java | 2 +- .../full/lookup/injection/visibility/Foo.java | 6 +- .../visibility/InjectionVisibilityTest.java | 1 - .../visibility/SimpleSessionBean.java | 3 +- .../full/lookup/injectionpoint/Animal.java | 4 +- .../injectionpoint/AnimalStereotype.java | 8 +- .../BeanWithInjectionPointMetadata.java | 6 +- .../tests/full/lookup/injectionpoint/Cat.java | 2 +- .../full/lookup/injectionpoint/Cattery.java | 2 +- .../ConstructorInjectionPointBean.java | 6 +- .../FieldInjectionPointBean.java | 6 +- .../InjectableReferenceTest.java | 13 +- .../injectionpoint/InjectionPointTest.java | 17 +- .../MethodInjectionPointBean.java | 6 +- .../tests/full/lookup/injectionpoint/Toy.java | 2 +- .../AmbiguousInjectableReferenceTest.java | 6 +- .../ambiguous/AmbiguousInjectionPoint.java | 2 +- .../ambiguous/AnnotatedInjectionField.java | 2 +- .../ambiguous/DerivedInjectedBean.java | 2 +- .../reference/ambiguous/InjectedBean.java | 2 +- .../reference/ambiguous/SimpleBean.java | 2 +- .../unresolved/AnnotatedInjectionField.java | 2 +- .../reference/unresolved/InjectedBean.java | 2 +- .../reference/unresolved/SimpleBean.java | 2 +- .../UnsatisfiedInjectableReferenceTest.java | 6 +- .../unresolved/UnsatisfiedInjectionPoint.java | 2 +- .../typesafe/resolution/decorator/Animal.java | 2 +- .../resolution/decorator/AnimalDecorator.java | 2 +- .../typesafe/resolution/decorator/Cat.java | 2 +- .../decorator/DecoratorNotInjectedTest.java | 2 +- .../typesafe/resolution/decorator/House.java | 2 +- .../tests/full/vetoed/AnimalStereotype.java | 70 ++--- .../cdi/tck/tests/full/vetoed/Elephant.java | 2 +- .../cdi/tck/tests/full/vetoed/Gecko.java | 4 +- .../tests/full/vetoed/ModifyingExtension.java | 2 +- .../cdi/tck/tests/full/vetoed/Predator.java | 2 +- .../tests/full/vetoed/VerifyingExtension.java | 2 +- .../cdi/tck/tests/full/vetoed/VetoedTest.java | 9 +- .../tck/tests/full/vetoed/aquarium/Fishy.java | 2 +- .../tests/full/vetoed/aquarium/Piranha.java | 2 +- .../full/vetoed/aquarium/package-info.java | 1 - .../BuiltinInterceptorInjectionTest.java | 2 +- .../metadata/broken/injection/Foo.java | 2 +- ...terceptedBeanConstructorInjectionTest.java | 3 +- .../InterceptedBeanFieldInjectionTest.java | 2 +- ...terceptedBeanInitializerInjectionTest.java | 2 +- .../BeanTypeParamConstructorTest.java | 2 +- .../typeparam/BeanTypeParamDisposerTest.java | 2 +- .../typeparam/BeanTypeParamFieldTest.java | 2 +- .../BeanTypeParamInitializerTest.java | 2 +- .../typeparam/BeanTypeParamProducerTest.java | 2 +- .../metadata/broken/typeparam/Cream.java | 2 +- .../metadata/broken/typeparam/Milk.java | 2 +- .../broken/typeparam/MilkDisposer.java | 2 +- .../broken/typeparam/MilkProducer.java | 2 +- .../broken/typeparam/YoghurtConstructor.java | 2 +- .../broken/typeparam/YoghurtField.java | 2 +- .../broken/typeparam/YoghurtInitializer.java | 2 +- .../broken/typeparam/interceptor/Binding.java | 2 +- .../InterceptedBeanConstructor.java | 2 +- .../interceptor/InterceptedBeanField.java | 2 +- .../InterceptedBeanInitializer.java | 2 +- ...terceptedBeanTypeParamConstructorTest.java | 2 +- .../InterceptedBeanTypeParamFieldTest.java | 2 +- ...terceptedBeanTypeParamInitializerTest.java | 2 +- .../interceptor/InterceptorConstructor.java | 2 +- .../interceptor/InterceptorField.java | 2 +- .../interceptor/InterceptorInitializer.java | 2 +- .../InterceptorTypeParamConstructorTest.java | 2 +- .../InterceptorTypeParamFieldTest.java | 2 +- .../InterceptorTypeParamInitializerTest.java | 2 +- .../disposal/method/definition/Animal.java | 36 +-- .../disposal/method/definition/Calisoga.java | 2 +- .../disposal/method/definition/Deadliest.java | 70 ++--- .../method/definition/DeadlyAnimal.java | 36 +-- .../method/definition/DeadlySpider.java | 36 +-- .../method/definition/DefangedTarantula.java | 2 +- .../DisposalMethodDefinitionTest.java | 21 +- .../method/definition/DisposalNonBean.java | 11 +- .../disposal/method/definition/Scary.java | 2 +- .../disposal/method/definition/Spider.java | 36 +-- .../method/definition/SpiderProducer.java | 4 +- .../disposal/method/definition/Tame.java | 72 ++--- .../disposal/method/definition/Tarantula.java | 46 ++-- .../disposal/method/definition/Widow.java | 2 +- .../InitializerUnallowedDefinitionTest.java | 2 +- .../broken/initializerUnallowed/Spider.java | 34 +-- .../SpiderProducer_Broken.java | 66 ++--- .../DisposerMethodOnInterceptorTest.java | 4 +- .../broken/interceptor/FooProducer.java | 2 +- .../definition/broken/interceptor/Secure.java | 2 +- .../interceptor/SimpleInterceptor_Broken.java | 2 +- ...ltipleDisposeParametersDefinitionTest.java | 5 +- .../definition/broken/multiParams/Spider.java | 34 +-- .../multiParams/SpiderProducer_Broken.java | 58 ++-- .../definition/broken/multiple/Bus.java | 2 +- .../broken/multiple/BusFactory.java | 2 +- ...eDisposerMethodsForProducerMethodTest.java | 2 +- .../definition/broken/multiple/Vehicle.java | 2 +- ...erverParameterUnallowedDefinitionTest.java | 2 +- .../definition/broken/observes/Spider.java | 34 +-- .../observes/SpiderProducer_Broken.java | 64 ++--- .../ProducesUnallowedDefinitionTest.java | 2 +- .../broken/producesUnallowed/Spider.java | 34 +-- .../SpiderProducer_Broken.java | 60 ++-- .../broken/unresolvedMethod/Cat.java | 40 +-- .../broken/unresolvedMethod/Spider.java | 34 +-- .../SpiderProducer_Broken.java | 68 ++--- ...nresolvedDisposalMethodDefinitionTest.java | 2 +- ...ethodParameterInjectionValidationTest.java | 2 +- .../broken/validation/ambiguous/Producer.java | 2 +- ...ethodParameterInjectionValidationTest.java | 2 +- .../validation/unsatisfied/Producer.java | 2 +- .../method/definition/inheritance/Apple.java | 64 ++--- .../definition/inheritance/AppleTree.java | 68 ++--- .../method/definition/inheritance/Chef.java | 60 ++-- .../method/definition/inheritance/Cook.java | 68 ++--- .../inheritance/GrannySmithAppleTree.java | 42 +-- .../GreatGrannySmithAppleTree.java | 60 ++-- .../method/definition/inheritance/Meal.java | 66 ++--- .../method/definition/inheritance/Yummy.java | 68 ++--- .../DisposedParameterPositionTest.java | 5 +- .../implementation/initializer/Chicken.java | 42 +-- .../initializer/ChickenHutch.java | 70 ++--- .../initializer/ChickenInterface.java | 2 +- .../tests/implementation/initializer/Fox.java | 50 ++-- .../initializer/InitializerMethodTest.java | 11 +- .../implementation/initializer/Preferred.java | 2 +- .../initializer/PreferredChicken.java | 2 +- .../initializer/PremiumChickenHutch.java | 2 +- .../initializer/StandardChicken.java | 2 +- .../initializer/StandardChickenHutch.java | 2 +- .../initializer/StandardVariety.java | 2 +- .../initializer/broken/generic/Bar.java | 2 +- .../initializer/broken/generic/Foo.java | 2 +- .../generic/GenericInitializerMethodTest.java | 2 +- ...nitializerMethodAnnotatedProducesTest.java | 5 +- .../Pheasant_Broken.java | 58 ++-- .../ParameterAnnotatedAsyncObservesTest.java | 2 +- .../Capercaillie_Broken.java | 56 ++-- .../ChickenHutch.java | 42 +-- .../ParameterAnnotatedDisposesTest.java | 2 +- .../DangerCall.java | 36 +-- .../Grouse_Broken.java | 56 ++-- .../ParameterAnnotatedObservesTest.java | 2 +- .../producer/field/definition/Animal.java | 36 +-- .../producer/field/definition/AsAnimal.java | 72 ++--- .../producer/field/definition/BlackWidow.java | 42 +-- .../field/definition/BlackWidowProducer.java | 2 +- .../producer/field/definition/Chicken.java | 2 +- .../field/definition/DaddyLongLegs.java | 36 +-- .../field/definition/DeadlyAnimal.java | 36 +-- .../field/definition/DeadlySpider.java | 36 +-- .../field/definition/DefangedTarantula.java | 42 +-- .../producer/field/definition/Egg.java | 2 +- .../producer/field/definition/Foo.java | 72 ++--- .../field/definition/FunnelWeaver.java | 2 +- .../FunnelWeaverSpiderConsumer.java | 2 +- .../FunnelWeaverSpiderProducer.java | 2 +- .../field/definition/InfertileChicken.java | 2 +- .../field/definition/LadybirdSpider.java | 50 ++-- .../definition/LameInfertileChicken.java | 42 +-- .../field/definition/OtherSpiderProducer.java | 82 +++--- .../producer/field/definition/Pet.java | 2 +- .../ProducerFieldDefinitionTest.java | 25 +- .../producer/field/definition/Spider.java | 48 ++-- .../definition/SpiderAsAnimalProducer.java | 2 +- .../field/definition/SpiderListProducer.java | 2 +- .../field/definition/SpiderStereotype.java | 6 +- .../producer/field/definition/Spidery.java | 68 ++--- .../producer/field/definition/Static.java | 72 ++--- .../definition/StaticTarantulaProducer.java | 2 +- .../producer/field/definition/Tame.java | 72 ++--- .../definition/TameTarantulaProducer.java | 2 +- .../producer/field/definition/Tarantula.java | 42 +-- .../field/definition/TarantulaProducer.java | 2 +- .../producer/field/definition/WolfSpider.java | 36 +-- .../ProducerFieldArrayTypeVariableTest.java | 9 +- .../array/ProducerFieldArrayWildcardTest.java | 4 +- .../definition/broken/inject/FooProducer.java | 2 +- .../InjectAnnotatedProducerFieldTest.java | 2 +- .../ProducerFieldOnInterceptorTest.java | 3 +- .../definition/broken/interceptor/Secure.java | 2 +- .../interceptor/SimpleInterceptor_Broken.java | 2 +- .../definition/broken/typeVariable/Foo.java | 2 +- .../ProducerFieldWithTypeVariableTest.java | 2 +- .../definition/broken/typeVariable2/Foo.java | 2 +- ...opedProducerFieldWithTypeVariableTest.java | 2 +- .../broken/wildcard/FunnelWeaver.java | 2 +- .../ProducerFieldTypeWithWildcardTest.java | 2 +- .../SpiderProducerWildCardType_Broken.java | 2 +- .../producer/field/lifecycle/Animal.java | 36 +-- .../producer/field/lifecycle/BlackWidow.java | 70 ++--- .../field/lifecycle/BlackWidowConsumer.java | 6 +- .../field/lifecycle/BlackWidowProducer.java | 2 +- .../producer/field/lifecycle/Broken.java | 72 ++--- .../field/lifecycle/BrownRecluse.java | 2 +- .../field/lifecycle/BrownRecluseProducer.java | 2 +- .../field/lifecycle/DeadlyAnimal.java | 36 +-- .../field/lifecycle/DeadlySpider.java | 36 +-- .../producer/field/lifecycle/Null.java | 72 ++--- .../field/lifecycle/NullSpiderConsumer.java | 10 +- .../NullSpiderConsumerForBrokenProducer.java | 6 +- .../field/lifecycle/NullSpiderProducer.java | 6 +- .../lifecycle/NullSpiderProducer_Broken.java | 6 +- .../lifecycle/ProducerFieldLifecycleTest.java | 16 +- .../producer/field/lifecycle/Spider.java | 48 ++-- .../field/lifecycle/SpiderStereotype.java | 6 +- .../producer/field/lifecycle/Static.java | 68 ++--- .../lifecycle/StaticTarantulaConsumer.java | 6 +- .../lifecycle/StaticTarantulaProducer.java | 2 +- .../producer/field/lifecycle/Tame.java | 72 ++--- .../producer/field/lifecycle/Tarantula.java | 36 +-- .../producer/field/lifecycle/Working.java | 68 ++--- .../ProducerMethodArrayTypeVariableTest.java | 7 +- .../ProducerMethodArrayWildcardTest.java | 4 +- .../ProducerMethodOnInterceptorTest.java | 3 +- .../method/broken/interceptor/Secure.java | 2 +- .../interceptor/SimpleInterceptor_Broken.java | 2 +- .../ParameterAnnotatedDisposesTest.java | 2 +- .../SpiderProducer_Broken.java | 2 +- .../ParameterAnnotatedObservesTest.java | 2 +- .../SpiderProducer_Broken.java | 2 +- .../ParameterAnnotatedAsyncObservesTest.java | 2 +- .../GeneralListProducer.java | 2 +- ...terizedReturnTypeWithTypeVariableTest.java | 5 +- ...rizedReturnTypeWithTypeVariable02Test.java | 3 +- .../FunnelWeaver.java | 2 +- .../ParameterizedTypeWithWildcardTest.java | 8 +- .../ParametrizedTypeWithWildcard02Test.java | 4 +- .../SpiderProducer.java | 2 +- .../Spiderman.java | 2 +- .../SpidermanProducer.java | 2 +- .../typeVariableReturnType/TProducer.java | 2 +- .../TypeVariableReturnTypeTest.java | 5 +- .../producer/method/definition/Acorn.java | 2 +- .../producer/method/definition/Animal.java | 36 +-- .../method/definition/AnimalStereotype.java | 66 ++--- .../producer/method/definition/Apple.java | 52 ++-- .../producer/method/definition/AppleTree.java | 52 ++-- .../producer/method/definition/Bite.java | 2 +- .../method/definition/BlackWidow.java | 2 +- .../producer/method/definition/Cherry.java | 2 +- .../method/definition/DaddyLongLegs.java | 36 +-- .../producer/method/definition/Deadliest.java | 70 ++--- .../method/definition/DeadlyAnimal.java | 36 +-- .../method/definition/DeadlySpider.java | 36 +-- .../method/definition/DefangedTarantula.java | 2 +- .../method/definition/FunnelWeaver.java | 3 +- .../definition/GeneralListProducer.java | 2 +- .../definition/GrannySmithAppleTree.java | 42 +-- .../definition/GreatGrannySmithAppleTree.java | 42 +-- .../method/definition/LadybirdSpider.java | 64 ++--- .../NonBeanWithStaticProducerMethod.java | 2 +- .../producer/method/definition/OakTree.java | 2 +- .../producer/method/definition/Pollen.java | 2 +- .../ProducerMethodDefinitionTest.java | 40 ++- .../producer/method/definition/Spider.java | 36 +-- .../method/definition/SpiderProducer.java | 2 +- .../producer/method/definition/Tame.java | 72 ++--- .../producer/method/definition/Tarantula.java | 46 ++-- .../method/definition/WolfSpider.java | 36 +-- .../producer/method/definition/Yummy.java | 72 ++--- .../producer/method/definition/name/Bug.java | 1 - .../method/definition/name/BugProducer.java | 2 +- .../method/definition/name/BugStereotype.java | 2 +- .../method/definition/name/Crazy.java | 72 ++--- .../method/definition/name/Funny.java | 72 ++--- .../ProducerMethodWithDefaultNameTest.java | 4 +- .../producer/method/lifecycle/Animal.java | 36 +-- .../method/lifecycle/BrownRecluse.java | 6 +- .../producer/method/lifecycle/Chicken.java | 2 +- .../method/lifecycle/DeadlyAnimal.java | 36 +-- .../method/lifecycle/DeadlySpider.java | 36 +-- .../producer/method/lifecycle/Delicious.java | 2 +- .../producer/method/lifecycle/Egg.java | 2 +- .../producer/method/lifecycle/Fail.java | 2 +- .../producer/method/lifecycle/FirstBorn.java | 2 +- .../method/lifecycle/FooException.java | 6 +- .../producer/method/lifecycle/Lays.java | 7 +- .../producer/method/lifecycle/Lorry.java | 2 +- .../lifecycle/LorryProducer_Broken.java | 6 +- .../producer/method/lifecycle/Null.java | 72 ++--- .../producer/method/lifecycle/Pet.java | 2 +- .../producer/method/lifecycle/PotatoChip.java | 2 +- .../ProducerMethodLifecycleTest.java | 5 +- .../producer/method/lifecycle/Request.java | 68 ++--- .../producer/method/lifecycle/Ship.java | 2 +- .../method/lifecycle/ShipProducer_Broken.java | 6 +- .../producer/method/lifecycle/Spider.java | 36 +-- .../producer/method/lifecycle/SpiderEgg.java | 2 +- .../method/lifecycle/SpiderProducer.java | 3 +- .../lifecycle/SpiderProducer_Broken.java | 60 ++-- .../producer/method/lifecycle/Tarantula.java | 72 ++--- .../producer/method/lifecycle/Web.java | 2 +- .../simple/definition/Antelope_NotBean.java | 2 +- .../implementation/simple/definition/Car.java | 2 +- .../simple/definition/ClovenHoved.java | 2 +- .../simple/definition/Cow_NotBean.java | 2 +- .../simple/definition/Donkey.java | 2 +- .../simple/definition/OuterClass.java | 2 +- .../simple/definition/Sheep.java | 2 +- .../definition/SimpleBeanDefinitionTest.java | 8 +- .../simple/definition/SimpleExtension.java | 2 +- .../simple/definition/Tame.java | 68 ++--- .../simple/definition/Tiger.java | 2 +- .../simple/definition/Turkey.java | 2 +- .../simple/definition/White.java | 4 +- .../simple/definition/broken/field/Bar.java | 2 +- .../simple/definition/broken/field/Foo.java | 2 +- ...njectedFieldAnnotatedWithProducesTest.java | 4 +- ...structorHasAsyncObservesParameterTest.java | 2 +- .../FoodConsumerBroken.java | 2 +- .../ConstructorHasDisposesParameterTest.java | 2 +- .../DisposingConstructor.java | 2 +- .../constructorHasDisposesParameter/Duck.java | 2 +- .../ConstructorHasObservesParameterTest.java | 2 +- .../constructorHasObservesParameter/Duck.java | 2 +- .../ObservingConstructor.java | 2 +- .../Leopard_Broken.java | 2 +- .../NormalScopedWithPublicFieldTest.java | 2 +- .../Leopard.java | 2 +- ...NormalScopedWithPublicStaticFieldTest.java | 2 +- .../Goose_Broken.java | 2 +- ...yInitializerAnnotatedConstructorsTest.java | 2 +- .../simple/lifecycle/Animal.java | 36 +-- .../simple/lifecycle/BookOrderProcessor.java | 2 +- .../simple/lifecycle/CdOrderProcessor.java | 2 +- .../implementation/simple/lifecycle/Cod.java | 2 +- .../implementation/simple/lifecycle/Egg.java | 2 +- .../simple/lifecycle/EggProducer.java | 2 +- .../implementation/simple/lifecycle/Farm.java | 2 +- .../simple/lifecycle/FarmOffice.java | 2 +- .../simple/lifecycle/FishPond.java | 2 +- .../simple/lifecycle/FishStereotype.java | 66 ++--- .../simple/lifecycle/FooException.java | 6 +- .../simple/lifecycle/Goldfish.java | 2 +- .../simple/lifecycle/Goose.java | 2 +- .../lifecycle/IndirectOrderProcessor.java | 42 +-- .../lifecycle/IntermediateOrderProcessor.java | 42 +-- .../simple/lifecycle/Lorry_Broken.java | 2 +- .../simple/lifecycle/NovelOrderProcessor.java | 2 +- .../simple/lifecycle/OrderProcessor.java | 2 +- .../simple/lifecycle/RedSnapper.java | 70 ++--- .../RequestScopedAnimalStereotype.java | 2 +- .../simple/lifecycle/Salmon.java | 2 +- .../simple/lifecycle/ShoeFactory.java | 2 +- .../lifecycle/SimpleBeanLifecycleTest.java | 18 +- .../simple/lifecycle/Synchronous.java | 2 +- .../implementation/simple/lifecycle/Tame.java | 6 +- .../implementation/simple/lifecycle/Tuna.java | 2 +- .../simple/lifecycle/TunaFarm.java | 2 +- .../simple/lifecycle/TunaProducer.java | 2 +- .../simple/lifecycle/Van_Broken.java | 2 +- .../unproxyable/UnproxyableBean.java | 2 +- .../UnproxyableManagedBeanTest.java | 2 +- .../tests/inheritance/generics/Amazing.java | 2 +- .../tck/tests/inheritance/generics/Foo.java | 2 +- .../tck/tests/inheritance/generics/Qux.java | 2 +- .../definition/AccountTransaction.java | 2 +- .../tests/interceptors/definition/Atomic.java | 2 +- .../interceptors/definition/AtomicFoo.java | 2 +- .../definition/AtomicInterceptor.java | 2 +- .../interceptors/definition/FileLogger.java | 2 +- .../definition/InterceptorDefinitionTest.java | 30 +- .../interceptors/definition/Loggable.java | 2 +- .../tests/interceptors/definition/Logged.java | 2 +- .../definition/MissileBinding.java | 2 +- .../definition/MissileInterceptor.java | 2 +- .../definition/NetworkLogger.java | 2 +- .../definition/NonBindingType.java | 6 +- .../NotEnabledAtomicInterceptor.java | 2 +- .../tests/interceptors/definition/Secure.java | 2 +- .../definition/SecureInterceptor.java | 2 +- .../definition/SecureTransaction.java | 2 +- .../interceptors/definition/ShoppingCart.java | 2 +- .../definition/Transactional.java | 7 +- .../definition/TransactionalInterceptor.java | 2 +- .../AntiAircraftIPBean.java | 2 +- .../AntiAircraftMissileFinalClass.java | 2 +- ...pendentBeanFinalMethodInterceptorTest.java | 4 +- .../FinalClassClassLevelIPBean.java | 5 +- .../FinalClassClassLevelInterceptorTest.java | 3 +- .../FinalClassClassLevelMissile.java | 2 +- .../FinalClassMethodLevelIPBean.java | 2 +- .../FinalClassMethodLevelMissile.java | 3 +- .../finalClassInterceptor/FooBinding.java | 2 +- .../MissileInterceptor.java | 2 +- ...alScopedBeanFinalClassInterceptorTest.java | 5 +- ...lScopedBeanFinalMethodInterceptorTest.java | 5 +- .../NuclearMissileFinalMethod.java | 6 +- .../NuclearMissileIPBean.java | 2 +- .../SurfaceToAirIPBean.java | 2 +- .../SurfaceToAirMissileFinalMethod.java | 8 +- .../broken/observer/FooPayload.java | 2 +- .../InterceptorWithObserverMethodTest.java | 6 +- .../broken/observer/Transactional.java | 2 +- .../observer/TransactionalInterceptor.java | 2 +- .../broken/observer/TransactionalService.java | 2 +- ...nterceptorWithAsyncObserverMethodTest.java | 2 +- .../broken/observer/async/Transactional.java | 2 +- .../async/TransactionalInterceptor.java | 2 +- .../observer/async/TransactionalService.java | 2 +- .../definition/inheritance/Culinary.java | 2 +- .../definition/inheritance/European.java | 2 +- .../definition/inheritance/EuropeanLarch.java | 2 +- .../inheritance/GuardedBySquirrel.java | 2 +- .../inheritance/GuardedByWoodpecker.java | 2 +- .../definition/inheritance/Herb.java | 2 +- .../InterceptorBindingInheritanceTest.java | 11 +- .../definition/inheritance/Larch.java | 2 +- .../definition/inheritance/Ping.java | 2 +- .../definition/inheritance/Plant.java | 2 +- .../definition/inheritance/PongPlant.java | 2 +- .../definition/inheritance/Rosehip.java | 2 +- .../definition/inheritance/Shrub.java | 2 +- .../inheritance/SquirrelInterceptor.java | 2 +- .../definition/inheritance/Thyme.java | 2 +- .../definition/inheritance/Tree.java | 2 +- .../inheritance/WoodpeckerInterceptor.java | 2 +- .../inheritance/broken/binding/Airbus.java | 2 +- .../inheritance/broken/binding/Boeing.java | 2 +- .../inheritance/broken/binding/Fighter.java | 2 +- .../broken/binding/FighterStereotype.java | 68 ++--- ...ithInheritedClassLevelInterceptorTest.java | 3 - ...ithInheritedStereotypeInterceptorTest.java | 3 - ...ithInheritedClassLevelInterceptorTest.java | 3 - ...ithInheritedStereotypeInterceptorTest.java | 3 - .../inheritance/broken/binding/Jumbojet.java | 2 +- .../broken/binding/LandingBinding.java | 2 +- .../broken/binding/LandingInterceptor.java | 2 +- .../broken/binding/Messerschmitt.java | 2 +- .../inheritance/broken/binding/Spitfire.java | 2 +- .../interceptorOrder/FirstInterceptor.java | 4 +- .../definition/interceptorOrder/Foo.java | 2 +- .../InterceptorOrderTest.java | 6 +- .../interceptorOrder/SecondInterceptor.java | 2 +- .../definition/interceptorOrder/Secure.java | 2 +- .../member/AnimalCountInterceptorBinding.java | 5 +- .../member/DecreasingInterceptor.java | 2 +- .../interceptors/definition/member/Farm.java | 3 +- .../member/IncreasingInterceptor.java | 2 +- .../InterceptorBindingTypeWithMemberTest.java | 1 - .../member/VehicleCountInterceptor.java | 2 +- .../VehicleCountInterceptorBinding.java | 2 +- .../invocation/AlmightyBinding.java | 2 +- .../invocation/AlmightyInterceptor.java | 2 +- .../invocation/InterceptorInvocationTest.java | 8 +- .../interceptors/invocation/Missile.java | 2 +- .../tests/interceptors/invocation/Rye.java | 2 +- .../interceptors/invocation/Warhead.java | 2 +- .../interceptors/invocation/Watcher.java | 2 +- .../tests/interceptors/invocation/Wheat.java | 2 +- .../invocation/WheatProducer.java | 2 +- .../cdi/tck/tests/invokers/InvokerHolder.java | 4 +- .../tests/invokers/InvokerHolderCreator.java | 6 +- .../invokers/InvokerHolderExtensionBase.java | 13 +- .../tck/tests/invokers/SimpleInvokerTest.java | 13 +- .../basic/BadInstanceInvokerTest.java | 19 +- .../basic/ExcessArgumentsInvokerTest.java | 19 +- .../basic/GoodInstanceInvokerTest.java | 13 +- .../basic/InstanceMethodInvokerTest.java | 35 +-- .../basic/InterceptedMethodInvokerTest.java | 25 +- .../basic/InvokerAssignabilityTest.java | 109 ++++---- .../invokers/basic/InvokerVisibilityTest.java | 9 +- .../basic/MissingArgumentsInvokerTest.java | 17 +- .../basic/PrimitiveParametersInvokerTest.java | 31 ++- .../PrimitiveReturnValueInvokerTest.java | 9 +- .../basic/StaticMethodInvokerTest.java | 35 +-- .../invokers/basic/ThrowingInvokerTest.java | 23 +- .../basic/VarargsMethodInvokerTest.java | 25 +- .../invokers/basic/VoidMethodInvokerTest.java | 15 +- .../basic/ZeroParametersInvokerTest.java | 13 +- .../invalid/ConstructorInvokerTest.java | 1 + .../invalid/InterceptorInvokerTest.java | 13 +- .../MethodFromDifferentClassInvokerTest.java | 1 + ...ObjectMethodButNotToStringInvokerTest.java | 1 + .../invalid/PrivateMethodInvokerTest.java | 1 + .../invalid/ProducerFieldBeanInvokerTest.java | 1 + .../ProducerMethodBeanInvokerTest.java | 1 + .../ArgumentArraySizeWithLookupTest.java | 19 +- .../lookup/ArgumentLookupBeanManagerTest.java | 20 +- .../lookup/ArgumentLookupDependentTest.java | 16 +- .../lookup/ArgumentLookupEventTest.java | 21 +- .../lookup/ArgumentLookupInstanceTest.java | 15 +- .../invokers/lookup/ArgumentLookupTest.java | 16 +- ...gumentLookupEqualToNumberOfParamsTest.java | 5 +- ...ntLookupGreaterThanNumberOfParamsTest.java | 5 +- .../BadArgumentLookupLessThanZeroTest.java | 5 +- .../lookup/InstanceLookupDependentTest.java | 9 +- .../InstanceLookupStaticMethodTest.java | 9 +- .../invokers/lookup/InstanceLookupTest.java | 9 +- .../invokers/lookup/LookupAmbiguousTest.java | 6 +- .../lookup/LookupUnsatisfiedTest.java | 5 +- .../BindingAnnotationWithMemberTest.java | 2 +- .../binding/members/annotation/Expensive.java | 2 +- .../members/annotation/SimpleAnnotation.java | 2 +- .../members/annotation/TheBeatles.java | 4 +- .../binding/members/annotation/Watch.java | 4 +- .../BindingAnnotationWithMemberTest.java | 2 +- .../binding/members/array/Expensive.java | 2 +- .../binding/members/array/TheBeatles.java | 4 +- .../lookup/binding/members/array/Watch.java | 4 +- .../cdi/tck/tests/lookup/byname/Animal.java | 36 +-- .../cdi/tck/tests/lookup/byname/Cod.java | 2 +- .../cdi/tck/tests/lookup/byname/Plaice.java | 2 +- .../lookup/byname/ResolutionByNameTest.java | 3 +- .../cdi/tck/tests/lookup/byname/Salmon.java | 2 +- .../cdi/tck/tests/lookup/byname/Sole.java | 2 +- .../tck/tests/lookup/byname/Whitefish.java | 68 ++--- .../lookup/byname/broken/duplicity/Cod.java | 2 +- .../broken/duplicity/DuplicitNameTest.java | 2 +- .../lookup/byname/broken/duplicity/Sole.java | 2 +- .../broken/injectionPointWithNamed/Foo.java | 2 +- .../NamedNonFieldInjectionPointTest.java | 2 +- .../broken/injectionPointWithNamed2/Foo.java | 2 +- .../NamedNonFieldInjectionPointTest.java | 2 +- .../broken/injectionPointWithNamed3/Foo.java | 2 +- .../NamedNonFieldInjectionPointTest.java | 2 +- .../lookup/byname/broken/prefix/Example.java | 2 +- .../broken/prefix/ExampleWebsite_Broken.java | 2 +- .../prefix/ExpandedNamePrefix2Test.java | 5 +- .../broken/prefix/ExpandedNamePrefixTest.java | 5 +- .../byname/broken/prefix/NamePrefixTest.java | 5 +- .../cdi/tck/tests/lookup/circular/Air.java | 2 +- .../cdi/tck/tests/lookup/circular/Bird.java | 2 +- .../cdi/tck/tests/lookup/circular/Car.java | 2 +- .../circular/CircularDependencyTest.java | 2 +- .../DependentSelfConsumingNormalProducer.java | 2 +- .../cdi/tck/tests/lookup/circular/Food.java | 2 +- .../cdi/tck/tests/lookup/circular/House.java | 2 +- .../NormalSelfConsumingNormalProducer.java | 2 +- .../cdi/tck/tests/lookup/circular/Petrol.java | 2 +- .../cdi/tck/tests/lookup/circular/Pig.java | 2 +- .../cdi/tck/tests/lookup/circular/Planet.java | 2 +- .../circular/SelfConsumingDependent1.java | 2 +- .../lookup/circular/SelfConsumingNormal.java | 2 +- .../lookup/circular/SelfConsumingNormal1.java | 2 +- .../cdi/tck/tests/lookup/circular/Space.java | 2 +- .../tck/tests/lookup/circular/Violation.java | 2 +- .../lookup/clientProxy/ClientProxyTest.java | 2 +- .../cdi/tck/tests/lookup/clientProxy/Fox.java | 2 +- .../tck/tests/lookup/clientProxy/Tuna.java | 2 +- .../tests/lookup/clientProxy/TunedTuna.java | 2 +- .../unproxyable/array/ArrayProducer.java | 2 +- .../unproxyable/array/ArrayTest.java | 2 +- .../array/InjectionPointBean_Broken.java | 46 ++-- .../beanConstructor/InjectionPointBean.java | 48 ++-- .../beanConstructor/Unproxyable_Broken.java | 54 ++-- .../finalClass/FinalClassTest.java | 2 +- .../unproxyable/finalClass/FishFarm.java | 2 +- .../unproxyable/finalClass/Tuna_Broken.java | 2 +- .../unproxyable/finalMethod/CarpBroken.java | 6 +- .../unproxyable/finalMethod/CarpFarm.java | 4 +- .../finalMethod/ExtendedTuna_Broken.java | 38 +-- .../unproxyable/finalMethod/FishFarm.java | 2 +- ...agePrivateFinalMethodNotProxyableTest.java | 2 +- .../unproxyable/finalMethod/PikeBroken.java | 6 +- .../unproxyable/finalMethod/PikeFarm.java | 4 +- .../finalMethod/PrivateFinalMethodTest.java | 9 +- .../ProtectedFinalMethodNotProxyableTest.java | 2 +- .../PublicFinalMethodNotProxyableTest.java | 2 +- .../finalMethod/StaticFinalMethodTest.java | 4 +- .../unproxyable/finalMethod/Tuna.java | 52 ++-- .../unproxyable/finalMethod/TunaFarm.java | 2 +- .../unproxyable/finalMethod/Tuna_Broken.java | 44 +-- .../unproxyable/finalMethod/Whale.java | 2 +- .../unproxyable/finalMethod/WhaleCovey.java | 9 +- .../unproxyable/interceptor/Fish.java | 8 +- .../interceptor/FishInterceptor.java | 12 +- .../interceptor/InterceptedBeanProxyTest.java | 25 +- .../unproxyable/interceptor/TestBean.java | 6 +- .../unproxyable/interceptor/Tuna.java | 34 +-- .../unproxyable/primitive/NumberProducer.java | 2 +- .../unproxyable/primitive/Number_Broken.java | 2 +- .../primitive/UnproxyableTest.java | 2 +- .../InjectionPointBean.java | 46 ++-- .../PrivateConstructorTest.java | 2 +- .../Unproxyable_Broken.java | 46 ++-- .../ambiguous/AmbiguousDependencyTest.java | 5 +- .../resolution/broken/ambiguous/Animal.java | 2 +- .../resolution/broken/ambiguous/Cow.java | 2 +- .../broken/ambiguous/Farm_Broken.java | 2 +- .../resolution/broken/ambiguous/Sheep.java | 2 +- .../broken/unsatisfied/Bean_Broken.java | 2 +- .../resolution/broken/unsatisfied/Small.java | 64 ++--- .../UnsatisfiedDependencyTest.java | 2 +- .../broken/unsatisfied/Vanilla.java | 36 +-- .../dynamic/AdvancedPaymentProcessor.java | 2 +- .../dynamic/AsynchronousPaymentProcessor.java | 2 +- .../lookup/dynamic/DynamicLookupTest.java | 21 +- .../tck/tests/lookup/dynamic/NonBinding.java | 68 ++--- .../lookup/dynamic/ObtainsInstanceBean.java | 94 +++---- .../cdi/tck/tests/lookup/dynamic/PayBy.java | 78 +++--- .../tests/lookup/dynamic/PayByBinding.java | 58 ++-- .../lookup/dynamic/PaymentProcessor.java | 34 +-- .../dynamic/RemotePaymentProcessor.java | 2 +- .../dynamic/SimplePaymentProcessor.java | 2 +- .../dynamic/SynchronousPaymentProcessor.java | 2 +- .../broken/raw/ConstructorInjectionBar.java | 2 +- .../raw/DisposerMethodInjectionBar.java | 2 +- .../dynamic/broken/raw/FieldInjectionBar.java | 2 +- .../tests/lookup/dynamic/broken/raw/Foo.java | 2 +- .../broken/raw/InitMethodInjectionBar.java | 2 +- .../broken/raw/ObserverInjectionBar.java | 2 +- .../raw/ProducerMethodInjectionBar.java | 2 +- .../RawInstanceConstructorInjectionTest.java | 2 +- .../raw/RawInstanceDisposerInjectionTest.java | 2 +- .../raw/RawInstanceFieldInjectionTest.java | 2 +- .../RawInstanceInitMethodInjectionTest.java | 2 +- .../raw/RawInstanceObserverInjectionTest.java | 2 +- ...awInstanceProducerMethodInjectionTest.java | 2 +- .../dynamic/builtin/AbstractAnimal.java | 2 +- .../tests/lookup/dynamic/builtin/Animal.java | 2 +- .../dynamic/builtin/BuiltinInstanceTest.java | 2 +- .../tck/tests/lookup/dynamic/builtin/Cow.java | 2 +- .../tests/lookup/dynamic/builtin/Farm.java | 2 +- .../lookup/dynamic/builtin/FarmBased.java | 72 ++--- .../tests/lookup/dynamic/builtin/Field.java | 2 +- .../DestroyingDependentInstanceTest.java | 12 +- .../DestroyingNormalScopedInstanceTest.java | 114 ++++---- .../tests/lookup/dynamic/handle/Alpha.java | 5 +- .../tests/lookup/dynamic/handle/Bravo.java | 5 +- .../tests/lookup/dynamic/handle/Client.java | 4 +- .../lookup/dynamic/handle/FirstProcessor.java | 1 + .../dynamic/handle/InstanceHandleTest.java | 9 +- .../tests/lookup/dynamic/handle/Juicy.java | 6 +- .../dynamic/handle/SecondProcessor.java | 1 + .../cdi/tck/tests/lookup/injection/Fox.java | 2 +- .../tests/lookup/injection/SpiderNest.java | 2 +- .../lookup/injection/SpiderProducer.java | 2 +- .../cdi/tck/tests/lookup/injection/Wolf.java | 2 +- .../tck/tests/lookup/injection/WolfPack.java | 2 +- .../injection/any/AnyInjectionTest.java | 2 +- .../tests/lookup/injection/any/Customer.java | 2 +- .../tck/tests/lookup/injection/any/Drink.java | 2 +- .../parameterized/ConsumerActualType.java | 2 +- .../injection/parameterized/ConsumerRaw.java | 2 +- .../parameterized/ConsumerRawObject.java | 2 +- .../parameterized/ConsumerTypeVariable.java | 2 +- .../ConsumerTypeVariableUpperBound.java | 2 +- .../lookup/injection/parameterized/Dao.java | 2 +- .../injection/parameterized/DaoProducer.java | 2 +- .../injection/parameterized/IntegerDao.java | 2 +- .../IntegerListOfStringsDao.java | 6 +- .../parameterized/IntegerPowered.java | 2 +- .../parameterized/IntegerStringDao.java | 3 +- .../injection/parameterized/NumberDao.java | 2 +- .../injection/parameterized/ObjectDao.java | 2 +- .../parameterized/ObjectPowered.java | 2 +- ...tionToParameterizedWithActualTypeTest.java | 6 +- ...onToParameterizedWithTypeVariableTest.java | 4 +- ...terizedWithTypeVariableUpperBoundTest.java | 4 +- ...ectionToParameterizedWithWildcardTest.java | 10 +- ...ameterizedTypesInjectionToRawTypeTest.java | 7 +- .../injection/parameterized/StringDao.java | 2 +- ...terizedTypesInjectionRawAmbiguousTest.java | 4 +- .../multiple/bounds/BarFooQualifier.java | 58 ++-- .../multiple/bounds/BazQualifier.java | 58 ++-- .../tests/lookup/injectionpoint/Animal.java | 2 +- .../tck/tests/lookup/injectionpoint/Baz.java | 2 +- .../lookup/injectionpoint/BazProducer.java | 2 +- .../BeanWithInjectionPointMetadata.java | 6 +- .../ConstructorInjectionPointBean.java | 6 +- .../FieldInjectionPointBean.java | 6 +- .../tck/tests/lookup/injectionpoint/Foo.java | 2 +- .../injectionpoint/InjectionPointTest.java | 16 +- .../MethodInjectionPointBean.java | 6 +- .../TransientFieldInjectionPointBean.java | 6 +- .../broken/disposer/Disposer_Broken.java | 1 - .../injectionpoint/broken/disposer/Nice.java | 2 +- .../broken/normal/scope/Cat_Broken.java | 2 +- .../NormalScopedBeanWithInjectionPoint.java | 2 +- .../lookup/injectionpoint/dynamic/Bar.java | 2 - .../dynamic/DynamicInjectionPointTest.java | 6 +- .../lookup/injectionpoint/dynamic/Foo.java | 2 +- .../lookup/injectionpoint/dynamic/Nice.java | 2 +- .../injectionpoint/dynamic/NiceFoo.java | 2 +- .../lookup/injectionpoint/named/Animal.java | 40 +-- .../lookup/injectionpoint/named/Carp.java | 2 +- .../injectionpoint/named/DaphniaProducer.java | 2 +- .../injectionpoint/named/FishingNet.java | 2 +- .../named/NamedAtInjectionPointTest.java | 3 +- .../injectionpoint/requiredtype/Conifer.java | 1 + .../injectionpoint/requiredtype/Leaf.java | 3 +- .../tests/lookup/manager/FishFarmOffice.java | 2 +- .../tck/tests/lookup/manager/ManagerTest.java | 8 +- .../lookup/typesafe/resolution/African.java | 2 +- .../lookup/typesafe/resolution/Animal.java | 36 +-- .../typesafe/resolution/AnimalFarmer.java | 2 +- .../typesafe/resolution/Australian.java | 2 +- .../lookup/typesafe/resolution/Bird.java | 2 +- .../lookup/typesafe/resolution/Canary.java | 2 +- .../tests/lookup/typesafe/resolution/Cat.java | 2 +- .../lookup/typesafe/resolution/Chunky.java | 72 ++--- .../typesafe/resolution/ChunkyLiteral.java | 2 +- .../tests/lookup/typesafe/resolution/Cod.java | 2 +- .../typesafe/resolution/DaddyLongLegs.java | 46 ++-- .../typesafe/resolution/DeadlyAnimal.java | 36 +-- .../typesafe/resolution/DeadlySpider.java | 36 +-- .../typesafe/resolution/DomesticCat.java | 2 +- .../lookup/typesafe/resolution/Dove.java | 2 +- .../tests/lookup/typesafe/resolution/Emu.java | 2 +- .../lookup/typesafe/resolution/European.java | 2 +- .../lookup/typesafe/resolution/Expensive.java | 2 +- .../typesafe/resolution/ExpensiveLiteral.java | 2 +- .../lookup/typesafe/resolution/Farmer.java | 2 +- .../typesafe/resolution/FlightlessBird.java | 2 +- .../lookup/typesafe/resolution/Halibut.java | 2 +- .../typesafe/resolution/LadybirdSpider.java | 50 ++-- .../lookup/typesafe/resolution/Lion.java | 2 +- .../tests/lookup/typesafe/resolution/Max.java | 2 +- .../tests/lookup/typesafe/resolution/Min.java | 2 +- .../lookup/typesafe/resolution/Number.java | 2 +- .../typesafe/resolution/NumberProducer.java | 2 +- .../lookup/typesafe/resolution/Parrot.java | 2 +- .../lookup/typesafe/resolution/PetShop.java | 2 +- .../lookup/typesafe/resolution/Plaice.java | 2 +- .../resolution/ResolutionByTypeTest.java | 21 +- .../typesafe/resolution/RoundWhitefish.java | 2 +- .../typesafe/resolution/ScottishFish.java | 36 +-- .../resolution/ScottishFishFarmer.java | 2 +- .../lookup/typesafe/resolution/Sole.java | 2 +- .../lookup/typesafe/resolution/Spider.java | 36 +-- .../typesafe/resolution/SpiderProducer.java | 2 +- .../lookup/typesafe/resolution/Tame.java | 2 +- .../lookup/typesafe/resolution/Tarantula.java | 36 +-- .../lookup/typesafe/resolution/Tuna.java | 2 +- .../lookup/typesafe/resolution/Whitefish.java | 72 ++--- .../lookup/typesafe/resolution/Wild.java | 2 +- .../broken/disabled/CrabSpider.java | 2 +- ...abledBeanNotAvailableForInjectionTest.java | 2 +- .../resolution/broken/disabled/Sea.java | 2 +- .../broken/type/variable/Animal.java | 2 +- .../resolution/broken/type/variable/Farm.java | 2 +- .../broken/type/variable/Sheep.java | 2 +- .../TypeVariableInjectionPointTest.java | 2 +- .../typesafe/resolution/interceptor/Cat.java | 2 +- .../interceptor/CatInterceptor.java | 2 +- .../interceptor/CatInterceptorBinding.java | 2 +- .../typesafe/resolution/interceptor/Foo.java | 2 +- ...InterceptorNotResolvedInterModuleTest.java | 6 +- .../InterceptorNotResolvedTest.java | 5 +- ...abilityOfRawAndParameterizedTypesTest.java | 42 ++- .../resolution/parameterized/Dao.java | 2 +- .../resolution/parameterized/DaoProducer.java | 4 +- .../parameterized/InjectedBean.java | 2 +- .../resolution/parameterized/IntegerDao.java | 2 +- .../parameterized/IntegerHashMap.java | 6 +- .../resolution/parameterized/MapProducer.java | 4 +- .../resolution/parameterized/ObjectDao.java | 2 +- .../resolution/parameterized/raw/Foo.java | 2 +- .../typesafe/resolution/primitive/Game.java | 2 +- .../PrimitiveInjectionPointTest.java | 5 +- .../primitive/PrimitiveProducer.java | 2 +- .../se/container/AlternativeStereotype.java | 1 + .../se/container/BarInterceptorBinding1.java | 3 +- .../se/container/BarInterceptorBinding2.java | 3 +- .../jboss/cdi/tck/tests/se/container/Baz.java | 2 +- .../container/BootstrapSEContainerTest.java | 30 +- .../jboss/cdi/tck/tests/se/container/Foo.java | 4 +- .../tck/tests/se/container/FooProducer.java | 2 +- .../cdi/tck/tests/se/container/Garply.java | 4 +- .../tests/se/container/GarplyProducer.java | 2 +- .../tck/tests/se/container/TestExtension.java | 2 +- .../contextualReference/FooBean.java | 3 +- .../InvalidContextualReferenceTest.java | 6 +- .../customClassloader/AlphaExtension.java | 2 +- .../customClassloader/BravoExtension.java | 4 +- .../CustomClassLoaderSETest.java | 7 +- .../ProcessedByExtension.java | 4 +- .../tests/se/container/testPackage/Apple.java | 3 +- .../se/context/ApplicationScopedObserver.java | 6 +- .../jboss/cdi/tck/tests/se/context/Bar.java | 2 +- .../jboss/cdi/tck/tests/se/context/Baz.java | 2 +- .../tck/tests/se/context/ContextSETest.java | 17 +- .../jboss/cdi/tck/tests/se/context/Foo.java | 6 +- .../AfterActivationInterceptor.java | 1 + .../BeforeActivationInterceptor.java | 1 + .../interceptor/RequestContextObserver.java | 1 + .../interceptor/RequestScopeCounter.java | 6 +- .../activation/interceptor/SecondCounter.java | 6 +- ...ateRequestContextProgrammaticallyTest.java | 1 + .../programmatic/RequestScopeCounter.java | 6 +- .../programmatic/TestContextActivator.java | 1 - .../context/custom/CustomRequestContext.java | 1 + .../custom/CustomRequestContextSETest.java | 3 +- .../context/custom/RequestScopeCounter.java | 6 +- .../se/context/custom/SecondCounter.java | 6 +- .../tck/tests/se/context/request/Payload.java | 2 +- .../se/context/request/ReqScopedCounter.java | 2 +- .../context/request/RequestContextTest.java | 12 +- .../se/context/request/TestObserver.java | 3 +- .../customCDIProvider/CustomCDIProvider.java | 6 +- .../CustomCDIProviderTest.java | 6 +- .../tck/tests/se/discovery/implicit/Bar.java | 5 +- ...icitBeanArchiveWithSystemPropertyTest.java | 1 + .../tck/tests/se/discovery/trimmed/Bar.java | 2 +- .../trimmed/BarInterceptorBinding.java | 5 +- .../se/discovery/trimmed/FooProducer.java | 2 +- .../se/discovery/trimmed/TestExtension.java | 1 - .../se/discovery/trimmed/TestStereotype.java | 2 +- .../trimmed/TrimmedBeanArchiveSETest.java | 6 +- .../se/events/lifecycle/ObservingBean.java | 6 +- .../events/lifecycle/StartupShutdownTest.java | 3 +- .../jboss/cdi/tck/tests/vetoed/Elephant.java | 2 +- .../org/jboss/cdi/tck/tests/vetoed/Shark.java | 1 + .../cdi/tck/tests/vetoed/VetoedTest.java | 6 +- .../cdi/tck/tests/vetoed/aquarium/Fishy.java | 8 +- .../tck/tests/vetoed/aquarium/Piranha.java | 2 +- .../tests/vetoed/aquarium/package-info.java | 1 - .../java/org/jboss/cdi/tck/util/Assert.java | 29 +- .../jboss/cdi/tck/util/BeanLookupUtils.java | 6 +- .../cdi/tck/util/ForwardingAnnotatedType.java | 8 +- .../tck/util/ForwardingBeanAttributes.java | 10 +- .../tck/util/ForwardingInjectionPoint.java | 8 +- .../cdi/tck/util/HierarchyDiscovery.java | 1 - .../cdi/tck/util/ParameterizedTypeImpl.java | 2 +- .../org/jboss/cdi/tck/util/SimpleLogger.java | 9 +- .../java/org/jboss/cdi/tck/util/Timer.java | 22 +- .../cdi/tck/util/TransformationUtils.java | 7 +- .../annotated/AnnotatedCallableWraper.java | 13 +- .../AnnotatedConstructorWrapper.java | 8 +- .../util/annotated/AnnotatedFieldWrapper.java | 5 +- .../annotated/AnnotatedMemberWrapper.java | 6 +- .../annotated/AnnotatedMethodWrapper.java | 11 +- .../annotated/AnnotatedParameterWrapper.java | 9 +- .../util/annotated/AnnotatedTypeWrapper.java | 17 +- .../tck/util/annotated/AnnotatedTypes.java | 3 +- .../tck/util/annotated/AnnotatedWrapper.java | 2 +- .../shrinkwrap/api/BeanDiscoveryMode.java | 4 +- .../jboss/shrinkwrap/api/BeansXmlVersion.java | 4 +- .../org/jboss/shrinkwrap/impl/BeansXml.java | 25 +- .../org/jboss/cdi/tck/test/package-info.java | 3 +- .../tck/test/porting/DummyContextuals.java | 1 + .../test/porting/DummyCreationalContexts.java | 1 + .../jboss/cdi/tck/test/porting/DummyEL.java | 3 +- .../tck/test/shrinkwrap/AssetUtilTest.java | 9 +- .../jboss/cdi/tck/test/shrinkwrap/Engine.java | 2 +- .../tck/test/shrinkwrap/EnginePowered.java | 2 +- .../tck/test/shrinkwrap/PoweredEngine.java | 2 +- .../shrinkwrap/WebArchiveBuilderTest.java | 25 +- .../shrinkwrap/beansxml/BeansXmlTest.java | 1 - .../model/tck/AnnotatedReceiverTypes.java | 12 +- .../lang/model/tck/AnnotatedSuperTypes.java | 20 +- .../lang/model/tck/AnnotatedThrowsTypes.java | 6 +- .../cdi/lang/model/tck/AnnotatedTypes.java | 258 +++++++++++------- .../lang/model/tck/AnnotationInstances.java | 90 +++--- .../cdi/lang/model/tck/AnnotationMembers.java | 26 +- .../jboss/cdi/lang/model/tck/EnumMembers.java | 102 ++++--- .../jboss/cdi/lang/model/tck/Equality.java | 9 +- .../lang/model/tck/InheritedAnnotations.java | 9 +- .../cdi/lang/model/tck/InterfaceMembers.java | 28 +- .../lang/model/tck/JavaLangObjectMethods.java | 2 +- .../cdi/lang/model/tck/LangModelUtils.java | 20 +- .../cdi/lang/model/tck/LangModelVerifier.java | 6 +- .../cdi/lang/model/tck/PlainClassMembers.java | 73 +++-- .../lang/model/tck/RepeatableAnnotations.java | 40 ++- ...essionBeanConstructorInterceptionTest.java | 7 +- .../bindings/resolution/ejb/BallBinding.java | 2 +- .../resolution/ejb/BallBindingLiteral.java | 2 +- .../resolution/ejb/BasketBinding.java | 2 +- .../resolution/ejb/BasketBindingLiteral.java | 2 +- .../ejb/ComplicatedInterceptor.java | 2 +- .../ejb/ComplicatedLifecycleInterceptor.java | 2 +- ...priseInterceptorBindingResolutionTest.java | 19 +- .../resolution/ejb/LoggedBinding.java | 2 +- .../resolution/ejb/MessageBinding.java | 2 +- .../bindings/resolution/ejb/PingBinding.java | 2 +- .../bindings/resolution/ejb/PongBinding.java | 2 +- .../resolution/ejb/ServiceStereotype.java | 2 +- .../resolution/ejb/TransactionalBinding.java | 2 +- .../aroundInvoke/bindings/ejb/Binding.java | 2 +- .../ee/AroundInvokeAccessInterceptorTest.java | 15 +- .../tests/contract/aroundInvoke/ee/Baz.java | 4 +- .../aroundInvoke/ee/BazInterceptor.java | 5 +- .../aroundInvoke/ee/FooInterceptor.java | 5 +- .../AroundTimeoutInterceptorTest.java | 2 +- .../tests/contract/aroundTimeout/Bell.java | 2 +- .../aroundTimeout/TimeoutInterceptor.java | 3 +- .../aroundTimeout/bindings/Binding.java | 2 +- .../environment/AroundInvokeInterceptor1.java | 2 +- .../environment/AroundInvokeInterceptor2.java | 2 +- .../AroundInvokeThreadInterceptor.java | 2 +- .../AroundTimeoutThreadInterceptor.java | 2 +- .../interceptorLifeCycle/environment/Foo.java | 2 +- .../environment/jndi/Bar.java | 6 +- .../environment/jndi/Foo.java | 8 +- .../environment/jndi/MyBinding.java | 2 +- .../environment/jndi/MyInterceptor.java | 7 +- .../environment/jndi/ejb/Bar.java | 5 +- .../environment/jndi/ejb/Foo.java | 5 +- .../environment/jndi/ejb/MyBinding.java | 2 +- .../environment/jndi/ejb/MyInterceptor.java | 7 +- .../bindings/ejb/Airborne.java | 2 +- .../bindings/ejb/AirborneInterceptor.java | 2 +- .../bindings/ejb/DestructionInterceptor.java | 2 +- .../bindings/ejb/Destructive.java | 2 +- .../lifecycleCallback/bindings/ejb/Foo.java | 2 +- .../bindings/ejb/Missile.java | 2 +- ...eanLifecycleInterceptorDefinitionTest.java | 1 + .../ejb/SuperDestructionInterceptor.java | 2 +- .../bindings/ejb/Weapon.java | 4 +- .../lifecycleCallback/ejb/Animal.java | 2 +- .../ejb/AnimalInterceptor.java | 6 +- .../contract/lifecycleCallback/ejb/Bar.java | 2 +- .../lifecycleCallback/ejb/CatInterceptor.java | 3 +- .../ejb/LifecycleCallbackInterceptorTest.java | 9 +- .../tck/selenium/ChromeDevtoolsDriver.java | 47 ++-- .../jboss/cdi/tck/selenium/DriverPool.java | 7 +- .../cdi/tck/selenium/ExtendedWebDriver.java | 6 +- .../org/jboss/cdi/tck/selenium/WebPage.java | 61 +++-- .../tck/shrinkwrap/ee/DummySessionBean.java | 4 +- .../tck/shrinkwrap/ee/WebArchiveBuilder.java | 3 +- .../enterprise/DisabledEjbInterface.java | 2 +- .../alternative/enterprise/EjbInterface.java | 2 +- .../alternative/enterprise/EnabledEjb.java | 2 +- .../alternative/enterprise/NotEnabledEjb.java | 2 +- .../resource/DatabaseProduction.java | 2 +- .../enterprise/resource/DatabaseTest.java | 2 +- .../resource/EnabledResourceProducer.java | 2 +- .../resource/NotEnabledResourceProducer.java | 2 +- .../ResourceAlternativeAvailabilityTest.java | 5 +- .../EnterpriseSelectedAlternative01Test.java | 14 +- .../EnterpriseSelectedAlternative02Test.java | 13 +- .../EnterpriseSelectedAlternative03Test.java | 21 +- .../SelectedAlternativeTestUtil.java | 14 +- .../selection/resource/ProductionReady.java | 2 +- .../resource/ResourceAlternative01Test.java | 3 +- .../resource/ResourceAlternative04Test.java | 3 +- ...sourceAlternativeExplicitPriorityTest.java | 4 +- .../selection/resource/ResourceProducer.java | 2 +- .../ActivateRequestContextinEETest.java | 5 +- .../tests/context/activation/TestServlet.java | 1 + .../application/ApplicationResource.java | 6 +- .../tck/tests/context/application/Result.java | 2 +- .../application/SimpleApplicationBean.java | 2 +- .../tests/context/application/TestFilter.java | 2 +- .../application/TestHttpSessionListener.java | 2 +- .../context/application/TestServlet.java | 6 +- .../TestServletContextListener.java | 2 +- .../TestServletRequestListener.java | 2 +- .../ApplicationContextAsyncListenerTest.java | 13 +- .../async/SimpleAsyncListener.java | 2 + .../application/async/StatusServlet.java | 4 +- .../ApplicationContextDestructionTest.java | 6 +- .../ApplicationContextDisposerTest.java | 1 - .../context/application/disposer/Edible.java | 2 +- .../context/application/ejb/BarBean.java | 4 +- .../tests/context/application/ejb/FMS.java | 2 +- .../context/application/ejb/FMSModelIII.java | 2 +- .../context/application/ejb/FooBean.java | 2 +- .../context/application/ejb/FooRemote.java | 2 +- .../ejb/SimpleApplicationBean.java | 2 +- .../ApplicationScopeEventMultiWarTest.java | 16 +- .../event/ApplicationScopeEventTest.java | 2 +- .../application/event/ObserverNames.java | 1 - .../application/event/PingServlet.java | 2 +- .../application/postconstruct/Action.java | 2 +- .../postconstruct/EagerSingleton.java | 2 +- ...gerSingletonPostConstructCallbackTest.java | 4 +- .../application/postconstruct/Service.java | 2 +- .../application/postconstruct/SimpleBean.java | 2 +- .../SimpleBeanPostConstructCallbackTest.java | 4 +- .../AbstractConversationTest.java | 4 +- .../conversation/BuiltInConversation.java | 2 +- .../ClientConversationContextTest.java | 9 +- .../tck/tests/context/conversation/Cloud.java | 6 +- .../context/conversation/CloudController.java | 2 +- .../ConversationTestPhaseListener.java | 5 +- .../tests/context/conversation/Cumulus.java | 2 +- ...datingSessionDestroysConversationTest.java | 5 +- ...versationPropagatedByFacesContextTest.java | 9 +- .../ManualCidPropagationTest.java | 5 +- .../context/conversation/OutermostFilter.java | 11 +- .../tck/tests/context/conversation/Storm.java | 2 +- .../determination/AsyncFooServlet.java | 3 +- .../determination/AsyncRequestProcessor.java | 4 +- .../conversation/determination/BarFilter.java | 2 +- .../determination/BazRequestListener.java | 2 +- .../ConversationDeterminationTest.java | 16 +- .../determination/FailingServlet.java | 5 +- .../determination/FooServlet.java | 2 +- .../determination/QuxAsyncListener.java | 5 +- .../determination/StatusServlet.java | 4 +- .../determination/TestResult.java | 2 +- .../event/ApplicationScopedObserver.java | 1 + .../event/ConversationScopedBean.java | 2 +- ...RunningConversationLifecycleEventTest.java | 7 +- .../context/conversation/event/Servlet.java | 2 +- ...ansientConversationLifecycleEventTest.java | 7 +- .../notattached/ConversationScopedBean.java | 2 +- ...AssociatedWithCurrentRequestEventTest.java | 5 +- .../event/notattached/ObservingBean.java | 2 +- .../event/notattached/TestServlet.java | 2 +- .../filter/ConversationFilterTest.java | 8 +- .../context/conversation/servlet/Message.java | 6 +- .../context/conversation/servlet/Servlet.java | 2 +- .../servlet/ServletConversationTest.java | 29 +- .../ejb/DependentContextEjbTest.java | 6 +- .../tck/tests/context/dependent/ejb/Farm.java | 2 +- .../context/dependent/ejb/FarmLocal.java | 2 +- .../tck/tests/context/dependent/ejb/Fox.java | 2 +- .../tests/context/dependent/ejb/FoxLocal.java | 2 +- .../tests/context/dependent/ejb/FoxRun.java | 2 +- .../context/dependent/ejb/FoxRunLocal.java | 2 +- .../tests/context/dependent/ejb/Horse.java | 6 +- .../tests/context/dependent/ejb/House.java | 2 +- .../context/dependent/ejb/HouseLocal.java | 2 +- .../tck/tests/context/dependent/ejb/Room.java | 2 +- .../context/dependent/ejb/RoomLocal.java | 2 +- .../tests/context/dependent/ejb/Stable.java | 6 +- .../tests/context/dependent/ejb/Table.java | 2 +- .../context/dependent/ejb/TableLocal.java | 2 +- .../context/jms/AbstractMessageListener.java | 3 +- .../cdi/tck/tests/context/jms/LogStore.java | 2 +- .../tck/tests/context/jms/LoggerService.java | 4 +- .../jms/MessageDrivenBeanContextTest.java | 5 +- .../context/jms/SimpleMessageProducer.java | 3 +- ...seBeanWithNonPassivatingDecoratorTest.java | 5 +- .../enterprise/MaarianHaminaLocal_Broken.java | 2 +- .../enterprise/MaarianhaminaDecorator.java | 2 +- .../enterprise/Maarianhamina_Broken.java | 52 ++-- .../enterprise/field/BrokenDecorator.java | 2 +- .../decorator/enterprise/field/District.java | 48 ++-- ...ssivatingInjectedFieldInDecoratorTest.java | 5 +- .../enterprise/field/EspooLocal_Broken.java | 2 +- .../enterprise/field/Espoo_Broken.java | 52 ++-- .../broken/enterprise/Cup_Broken.java | 2 +- ...ionCapableEjbWithPassivatingScopeTest.java | 6 +- .../broken/enterprise/field/District.java | 50 ++-- .../enterprise/field/EspooLocal_Broken.java | 2 +- .../broken/enterprise/field/Espoo_Broken.java | 60 ++-- ...ctedIntoPassivatingEnterpriseBeanTest.java | 2 +- .../interceptor/enterprise/Digital.java | 2 +- .../enterprise/DigitalInterceptor.java | 2 +- ...BeanWithNonPassivatingInterceptorTest.java | 6 +- .../interceptor/enterprise/Telephone.java | 2 +- .../enterprise/field/BrokenInterceptor.java | 2 +- .../enterprise/field/District.java | 48 ++-- ...ivatingInjectedFieldInInterceptorTest.java | 4 +- .../enterprise/field/EspooLocal_Broken.java | 2 +- .../enterprise/field/Espoo_Broken.java | 56 ++-- .../producer/field/enterprise/British.java | 64 ++--- .../ConstructorInjectionCorralBroken.java | 11 +- .../producer/field/enterprise/Corral.java | 4 +- .../broken/producer/field/enterprise/Cow.java | 2 +- .../field/enterprise/CowProducer.java | 2 +- ...terpriseBeanWithIllegalDependencyTest.java | 2 +- .../FieldInjectionCorralBroken.java | 62 ++--- .../SetterInjectionCorralBroken.java | 8 +- .../producer/method/enterprise/British.java | 76 +++--- .../ConstructorInjectionCorralBroken.java | 11 +- .../producer/method/enterprise/Cow.java | 2 +- .../method/enterprise/CowProducer.java | 2 +- ...terpriseBeanWithIllegalDependencyTest.java | 2 +- .../FieldInjectionCorralBroken.java | 60 ++-- .../producer/method/enterprise/Herd.java | 7 +- ...ducerMethodParamInjectionCorralBroken.java | 8 +- .../producer/method/enterprise/Ranch.java | 2 +- .../SetterInjectionCorralBroken.java | 8 +- .../resource/persistence/Another.java | 66 ++--- .../DataSourcePassivationDependencyTest.java | 3 +- .../persistence/DataSourceProducer.java | 5 +- .../dependency/resource/persistence/Pool.java | 3 +- .../resource/remote/ejb/FooBean.java | 2 - .../SessionBeanPassivationDependencyTest.java | 4 +- .../passivating/enterprise/Digital.java | 2 +- .../enterprise/DigitalInterceptor.java | 2 +- .../NonPassivationCapableSessionBeanTest.java | 8 +- .../passivating/enterprise/Telephone.java | 2 +- .../passivating/enterprise/TelephoneLine.java | 2 +- .../enterprise/invalid/Digital.java | 2 +- .../invalid/DigitalInterceptor.java | 2 +- .../invalid/StatefulSessionBeanTest.java | 1 + .../enterprise/invalid/Telephone.java | 2 +- .../enterprise/invalid/TelephoneLine.java | 6 +- .../passivating/enterprise/valid/Digital.java | 2 +- .../enterprise/valid/DigitalInterceptor.java | 2 +- .../enterprise/valid/ElephantLocal.java | 4 +- .../enterprise/valid/Telephone.java | 2 +- .../enterprise/valid/TelephoneLine.java | 6 +- .../context/request/SimpleRequestBean.java | 2 +- .../tck/tests/context/request/TestFilter.java | 2 +- .../request/TestServletRequestListener.java | 2 +- .../RequestContextAsyncListenerTest.java | 14 +- .../request/async/SimpleAsyncListener.java | 2 + .../context/request/async/StatusBean.java | 2 +- .../context/request/async/StatusServlet.java | 4 +- .../tests/context/request/ejb/BarBean.java | 4 +- .../tck/tests/context/request/ejb/FMS.java | 2 +- .../context/request/ejb/FMSModelIII.java | 2 +- .../tests/context/request/ejb/FooBean.java | 2 +- .../tests/context/request/ejb/FooRemote.java | 2 +- .../context/request/ejb/FooRequestBean.java | 2 +- .../request/ejb/SimpleRequestBean.java | 2 +- .../context/request/event/ObservingBean.java | 5 +- .../request/event/RequestScopeEventTest.java | 4 +- .../tests/context/request/event/Servlet.java | 2 +- .../async/ApplicationScopedObserver.java | 2 +- .../request/event/async/InfoServlet.java | 2 +- .../event/jms/ApplicationScopedObserver.java | 2 +- .../RequestScopeEventMessageDeliveryTest.java | 6 +- .../event/jms/SimpleMessageProducer.java | 3 +- .../remote/ApplicationScopedObserver.java | 2 +- .../context/request/event/remote/FooBean.java | 2 +- .../request/event/remote/FooRemote.java | 2 +- .../remote/RequestScopeEventRemoteTest.java | 6 +- .../event/remote/RequestScopedObserver.java | 2 +- .../timeout/ApplicationScopedObserver.java | 2 +- .../timeout/RequestScopeEventTimeoutTest.java | 2 +- .../event/timeout/RequestScopedObserver.java | 2 +- .../tck/tests/context/request/jaxrs/Foo.java | 5 +- .../context/request/jaxrs/FooResource.java | 2 +- .../context/request/jaxrs/InfoServlet.java | 2 +- .../request/jaxrs/RequestContextTest.java | 2 +- .../context/request/postconstruct/Action.java | 2 +- .../request/postconstruct/EagerSingleton.java | 2 +- .../EagerSingletonInfoServlet.java | 2 +- ...gerSingletonPostConstructCallbackTest.java | 4 +- .../postconstruct/RequestContextObserver.java | 2 +- .../request/postconstruct/SimpleBean.java | 2 +- .../SimpleBeanPostConstructCallbackTest.java | 7 +- .../postconstruct/SimpleInfoServlet.java | 2 +- .../context/session/IntrospectFilter.java | 24 +- .../IntrospectHttpSessionListener.java | 22 +- .../context/session/IntrospectServlet.java | 56 ++-- .../IntrospectServletRequestListener.java | 30 +- .../context/session/SessionContextTest.java | 236 ++++++++-------- .../context/session/SimpleSessionBean.java | 8 +- .../tck/tests/context/session/TestFilter.java | 54 ++-- .../tests/context/session/TestServlet.java | 52 ++-- .../SessionContextAsyncListenerTest.java | 10 +- .../context/session/async/StatusBean.java | 2 +- .../context/session/async/StatusServlet.java | 4 +- .../tests/context/session/event/Servlet.java | 5 +- .../session/event/SessionScopeEventTest.java | 3 +- .../session/event/SessionScopedBean.java | 2 +- ...sionContextServletRequestListenerTest.java | 46 ++-- .../session/listener/SimpleSessionBean.java | 6 +- .../listener/TestHttpSessionListener.java | 66 ++--- .../listener/TestServletRequestListener.java | 26 +- .../SessionContextListenerShutdownTest.java | 3 +- ...uiltinHttpServletRequestDecoratorTest.java | 20 +- .../BuiltinServletContextDecoratorTest.java | 14 +- .../BuiltinHttpSessionDecoratorTest.java | 15 +- .../http/session/HttpSessionDecorator1.java | 4 +- .../http/session/HttpSessionDecorator2.java | 4 +- .../builtin/http/session/SessionListener.java | 2 +- .../BuiltinPrincipalDecoratorTest.java | 14 +- .../BuiltinUserTransactionDecoratorTest.java | 6 +- .../definition/lifecycle/BankAccount.java | 4 +- .../definition/lifecycle/BankServlet.java | 2 +- .../definition/lifecycle/ChargeDecorator.java | 4 +- ...ecoratorInstanceIsDependentObjectTest.java | 14 +- .../definition/lifecycle/DurableAccount.java | 2 +- .../lifecycle/ShortTermAccount.java | 2 +- .../ejb/EJBDecoratorInvocationTest.java | 6 +- .../tests/decorators/invocation/ejb/Pig.java | 6 +- .../decorators/invocation/ejb/PigSty.java | 4 +- .../invocation/ejb/PigStyDecorator.java | 2 +- .../decorators/invocation/ejb/PigStyImpl.java | 4 +- .../decorators/invocation/enterprise/Bar.java | 2 +- .../invocation/enterprise/BusinessBase.java | 2 +- .../EnterpriseDecoratorInvocationTest.java | 9 +- .../invocation/enterprise/FooBinding.java | 2 +- .../invocation/enterprise/FooInterceptor.java | 2 +- .../ordering/global/DecoratedImpl.java | 4 +- .../EnterpriseDecoratorOrderingTest.java | 10 +- .../global/GlobalDecoratorOrderingTest.java | 12 +- .../ejb/RestrictedSessionBeanTest.java | 4 +- .../bean/broken/restricted/ejb/RockBean.java | 5 +- .../bean/types/enterprise/Mock.java | 72 ++--- .../enterprise/SessionBeanTypesTest.java | 5 +- .../bean/types/enterprise/illegal/Bird.java | 2 +- .../qualifier/enterprise/BorderCollie.java | 40 +-- .../enterprise/BorderCollieLocal.java | 42 +-- .../enterprise/EnglishBorderCollie.java | 42 +-- .../enterprise/EnglishBorderCollieLocal.java | 42 +-- .../EnterpriseQualifierDefinitionTest.java | 2 +- .../qualifier/enterprise/FamousCat.java | 2 +- .../qualifier/enterprise/FamousCatLocal.java | 2 +- .../qualifier/enterprise/Hairless.java | 2 +- .../qualifier/enterprise/HairlessCat.java | 2 +- .../enterprise/HairlessQualifier.java | 2 +- .../qualifier/enterprise/Hairy.java | 72 ++--- .../qualifier/enterprise/HairyQualifier.java | 56 ++-- .../qualifier/enterprise/LongHairedDog.java | 36 +-- .../qualifier/enterprise/Skinny.java | 2 +- .../enterprise/SkinnyHairlessCat.java | 2 +- .../enterprise/SkinnyHairlessCatLocal.java | 2 +- .../qualifier/enterprise/SkinnyQualifier.java | 2 +- .../enterprise/TameSkinnyHairlessCat.java | 2 +- .../TameSkinnyHairlessCatLocal.java | 2 +- .../ejb/SessionBeanTooManyScopesTest.java | 14 +- ...ssionBeanWithTooManyScopeTypes_Broken.java | 46 ++-- ...ionBeanProducerFieldTooManyScopesTest.java | 14 +- ...ucerFieldWithTooManyScopeTypes_Broken.java | 54 ++-- .../ejb/producer/field/Word.java | 14 +- ...onBeanProducerMethodTooManyScopesTest.java | 14 +- ...cerMethodWithTooManyScopeTypes_Broken.java | 58 ++-- .../ejb/producer/method/Word.java | 14 +- .../scope/enterprise/BengalTiger.java | 2 +- .../scope/enterprise/BengalTigerLocal.java | 2 +- .../scope/enterprise/BorderCollie.java | 40 +-- .../scope/enterprise/BorderCollieLocal.java | 42 +-- .../definition/scope/enterprise/Cat.java | 2 +- .../definition/scope/enterprise/Dog.java | 42 +-- .../scope/enterprise/EnglishBorderCollie.java | 42 +-- .../enterprise/EnglishBorderCollieLocal.java | 42 +-- .../EnterpriseScopeDefinitionTest.java | 2 +- .../scope/enterprise/FooScoped.java | 2 +- .../definition/scope/enterprise/Siamese.java | 2 +- .../scope/enterprise/SiameseLocal.java | 2 +- .../definition/scope/enterprise/Tiger.java | 2 +- ...seStereotypeAlternativeSpecializeTest.java | 4 +- .../EnterpriseStereotypeAlternativeTest.java | 4 +- .../alternative/enterprise/Mock.java | 2 +- .../stereotype/enterprise/Animal.java | 36 +-- .../enterprise/AnimalStereotype.java | 68 ++--- .../stereotype/enterprise/Barracuda.java | 2 +- .../stereotype/enterprise/BarracudaLocal.java | 2 +- .../stereotype/enterprise/BorderCollie.java | 42 +-- .../enterprise/BorderCollieLocal.java | 36 +-- .../stereotype/enterprise/Chihuahua.java | 52 ++-- .../stereotype/enterprise/ChihuahuaLocal.java | 42 +-- .../enterprise/EnglishBorderCollie.java | 42 +-- .../enterprise/EnglishBorderCollieLocal.java | 42 +-- .../EnterpriseStereotypeDefinitionTest.java | 2 +- .../stereotype/enterprise/Fish.java | 2 +- .../stereotype/enterprise/FishStereotype.java | 2 +- .../stereotype/enterprise/LongHairedDog.java | 36 +-- .../enterprise/MexicanChihuahua.java | 52 ++-- .../enterprise/MexicanChihuahuaLocal.java | 42 +-- .../stereotype/enterprise/ShortHairedDog.java | 58 ++-- .../stereotype/enterprise/TameBarracuda.java | 2 +- .../enterprise/TameBarracudaLocal.java | 2 +- .../interceptor/enterprise/AlphaBinding.java | 2 +- .../enterprise/AlphaInterceptor.java | 2 +- .../enterprise/AlphaStereotype.java | 64 ++--- ...priseStereotypeInterceptorBindingTest.java | 5 +- .../interceptor/enterprise/Foo.java | 2 +- .../EnterpriseBeanDiscoveryTest.java | 30 +- .../enterprise/annotated/AppleTree.java | 19 +- .../enterprise/annotated/AppleTreeLocal.java | 6 +- ...nterpriseDefaultBeanDiscoveryModeTest.java | 8 +- .../enterprise/annotated/TestExtension.java | 1 - .../DefaultBeanDiscoveryModeTest.java | 9 +- .../discovery/implicit/DummyBean.java | 3 +- .../discovery/implicit/TestExtension.java | 12 +- .../packaging/bundledLibrary/Bar.java | 4 +- .../packaging/bundledLibrary/Baz.java | 2 +- .../packaging/bundledLibrary/Foo.java | 4 +- .../packaging/bundledLibrary/Unlucky.java | 2 +- .../deployment/packaging/ear/BarWebBean.java | 2 +- .../deployment/packaging/ear/FooWebBean.java | 2 +- .../ear/MultiWebModuleWithExtensionTest.java | 3 +- .../ear/SingleWebModuleWithExtensionTest.java | 3 +- .../modules/EnterpriseArchiveModulesTest.java | 14 +- .../ear/modules/LoggingDecorator.java | 2 +- .../packaging/ear/modules/NonEnterprise.java | 2 +- .../packaging/ear/modules/Secured.java | 2 +- .../tests/deployment/packaging/ejb/Bar.java | 1 - .../packaging/ejb/EJBJarDeploymentTest.java | 5 - .../deployment/packaging/ejb/FooBean.java | 2 +- .../deployment/packaging/ejb/FooRemote.java | 2 +- .../packaging/installedLibrary/Bravo.java | 2 +- .../rar/ResourceAdapterArchiveTest.java | 3 +- .../packaging/rar/TestResourceAdapter.java | 17 +- .../JarToJarAlphaVisibilityTest.java | 3 +- .../JarToJarReverseAlphaVisibilityTest.java | 3 +- ...esFromExtensionInAlphaBeanArchiveTest.java | 4 +- ...esFromExtensionInBravoBeanArchiveTest.java | 4 +- .../packaging/war/modules/Bazinga.java | 2 +- .../war/modules/ContainerEventsObserver.java | 3 +- .../war/modules/LoggingDecorator.java | 2 +- .../packaging/war/modules/Secured.java | 2 +- .../war/modules/WebArchiveModulesTest.java | 14 +- .../ApplicationShutdownLifecycleTest.java | 15 +- .../LifecycleMonitoringExtension.java | 4 +- ...JBObserverMethodNotBusinessMethodTest.java | 4 +- .../observer/notBusinessMethod/Terrier.java | 2 +- .../TibetanTerrier_Broken.java | 2 +- ...bserverMethodRemoteBusinessMethodTest.java | 5 +- ...bserverMethodRemoteBusinessMethodTest.java | 5 +- .../remoteBusinessMethod/FoxTerrrier.java | 4 +- .../remoteBusinessMethod/Terrier.java | 4 +- .../remoteBusinessMethod/TibetanTerrier.java | 6 +- .../event/observer/context/FooObserver.java | 5 +- .../context/async/AsyncMessageObserver.java | 5 +- ...ncObserverMethodInvocationContextTest.java | 3 +- ...ContextPropagationInAsyncObserverTest.java | 3 +- .../context/async/enterprise/Printer.java | 4 +- .../context/async/enterprise/Text.java | 6 +- .../context/enterprise/FooObserver.java | 5 +- .../enterprise/staticMethod/FooObserver.java | 6 +- .../observer/inheritance/enterprise/Egg.java | 44 +-- .../EnterpriseObserverInheritanceTest.java | 4 +- .../inheritance/enterprise/EventPayload.java | 2 +- .../inheritance/enterprise/Farmer.java | 55 ++-- .../inheritance/enterprise/FarmerLocal.java | 51 ++-- .../enterprise/IndirectStockWatcher.java | 52 ++-- .../enterprise/IndirectStockWatcherLocal.java | 39 ++- .../enterprise/IntermediateStockWatcher.java | 42 +-- .../inheritance/enterprise/LazyFarmer.java | 49 ++-- .../enterprise/LazyFarmerLocal.java | 39 ++- .../inheritance/enterprise/StockPrice.java | 42 +-- .../inheritance/enterprise/StockWatcher.java | 57 ++-- .../enterprise/StockWatcherLocal.java | 49 ++-- ...extLifecycleEventObserverOrderingTest.java | 5 +- .../ee/RequestContextLifecycleObserver.java | 12 +- .../transactional/OnlineAccountService.java | 10 +- .../PhisherAccountTransactionObserver.java | 36 +-- .../ReceiverAccountTransactionObserver.java | 30 +- .../SenderAccountTransactionObserver.java | 23 +- .../observer/resolve/enterprise/EJBEvent.java | 2 +- .../resolve/enterprise/LocalInterface.java | 2 +- .../resolve/enterprise/NoInterfaceSLSB.java | 2 +- .../ResolveEnterpriseEventObserverTest.java | 2 +- .../observer/resolve/enterprise/Spitz.java | 2 +- .../transactional/AccountService.java | 8 +- .../AccountTransactionObserver.java | 20 +- .../TransactionalObserverTest.java | 21 +- .../transactional/custom/Giraffe.java | 2 +- .../custom/GiraffeCustomObserver.java | 2 +- .../transactional/custom/GiraffeObserver.java | 7 +- .../custom/ObserverExtension.java | 2 +- .../TransactionalObserverRollbackTest.java | 2 +- .../metadata/ejb/AlternativeMetadataTest.java | 11 +- .../alternative/metadata/ejb/Pasta.java | 1 + .../metadata/ejb/PastaWrapper.java | 7 +- .../ejb/ProcessAnnotatedTypeObserver.java | 2 +- .../ejb/EnterpriseWithAnnotationsTest.java | 8 +- .../annotated/delivery/ejb/Hawk.java | 1 + .../ejb/CreateBeanAttributesTest.java | 23 +- .../beanManager/beanAttributes/ejb/Dam.java | 2 +- .../beanManager/beanAttributes/ejb/Lake.java | 3 +- .../beanAttributes/ejb/LakeLocal.java | 3 +- .../extensions/container/event/Cheese.java | 2 +- .../container/event/ContainerEventTest.java | 18 +- .../tests/extensions/container/event/Cow.java | 4 +- .../extensions/container/event/CowLocal.java | 4 +- .../extensions/container/event/Farm.java | 2 +- .../extensions/container/event/Food.java | 2 +- .../extensions/container/event/Milk.java | 2 +- .../extensions/container/event/Sheep.java | 2 +- .../container/event/SheepInterceptor.java | 2 +- .../container/event/SheepLocal.java | 2 +- .../extensions/container/event/Tame.java | 2 +- .../event/jms/ContainerEventTest.java | 8 +- .../extensions/container/event/jms/Sheep.java | 2 +- .../interceptors/IncrementingInterceptor.java | 2 +- .../interceptors/InterceptorExtension.java | 10 +- .../InterceptorExtensionTest.java | 17 +- .../extensions/interceptors/Suffixed.java | 4 +- .../extensions/interceptors/WordSource.java | 6 +- ...erLifeCycleEventRuntimeInvocationTest.java | 35 ++- .../lifecycle/events/SimpleBean.java | 6 +- .../lifecycle/events/TestExtension.java | 16 +- ...erLifeCycleEventRuntimeInvocationTest.java | 70 ++--- .../lifecycle/events/ejb/SimpleBean.java | 6 +- .../lifecycle/events/ejb/TestExtension.java | 7 +- .../ProcessBeanAttributesObserver.java | 8 +- .../processBeanAttributes/ejb/Delta.java | 3 +- .../ejb/VerifyValuesTest.java | 36 +-- .../ejb/VerifyingExtension.java | 4 +- .../ee/ProcessInjectionPointFiredTest.java | 21 +- .../processInjectionPoint/ee/TestFilter.java | 1 + .../ee/TestListener.java | 1 + .../processInjectionPoint/ee/TestServlet.java | 2 +- .../ee/VerifyingExtension.java | 6 +- .../ContainerEventTest.java | 23 +- .../CustomInjectionTarget.java | 3 +- .../processInjectionTarget/Farm.java | 2 +- .../processInjectionTarget/Fence.java | 2 +- .../FenceInterceptor.java | 3 +- .../ProcessInjectionTargetObserver.java | 21 +- .../processInjectionTarget/Sheep.java | 6 +- .../processInjectionTarget/TestFilter.java | 3 +- .../processInjectionTarget/TestListener.java | 2 +- .../processInjectionTarget/TestServlet.java | 7 +- .../TestTagHandler.java | 5 +- .../extensions/processBean/ejb/Elephant.java | 2 +- .../processBean/ejb/ElephantLocal.java | 2 +- .../ejb/ProcessSessionBeanTest.java | 3 +- .../producer/remote/ProducerProcessor.java | 2 +- .../producer/remote/RemoteProducerTest.java | 6 +- .../producer/remote/ServiceBean.java | 2 +- .../producer/remote/ServiceProducer.java | 2 +- .../producer/remote/ServiceRemote.java | 2 +- ...notherManualBeanRegistrationExtension.java | 2 +- .../registration/BeanClassToRegister.java | 2 +- ...gistrationByExtensionInWarLibraryTest.java | 7 +- .../tests/extensions/registration/Beanie.java | 2 +- .../extensions/registration/BeanieType.java | 1 + .../registration/BeanieTypeLiteral.java | 2 +- .../ManualBeanRegistrationExtension.java | 2 +- .../TwoBeansOneClassExtension.java | 13 +- .../registration/TwoBeansOneClassTest.java | 10 +- ...eredByExtensionFromNonBeanLibraryTest.java | 3 +- .../builtin/BuiltInBeansTest.java | 7 +- .../builtin/MockLoginModule.java | 5 +- .../builtin/PrincipalInjectedBean.java | 14 +- .../builtin/PrincipalInjectedBeanLocal.java | 7 +- .../builtin/UserTransactionInjectedBean.java | 2 +- .../UserTransactionInjectedBeanLocal.java | 4 +- .../ContainerManagedTransactionBean.java | 4 +- .../UserTransactionInvalidInjectionTest.java | 2 +- .../ee/BuiltinMetadataEEBeanTest.java | 4 +- .../metadata/ee/ServletInterceptor.java | 2 +- .../builtin/metadata/ee/TestServlet.java | 3 +- .../session/BakeryProductDecorator.java | 2 +- .../BuiltinMetadataSessionBeanTest.java | 13 +- .../builtin/metadata/session/Frozen.java | 10 +- .../builtin/servlet/LowercaseConverter.java | 4 +- .../servlet/LowercaseConverterServlet.java | 2 +- .../ServletContainerBuiltinBeanTest.java | 10 +- .../enterprise/methodOnSessionBean/Apple.java | 2 +- .../methodOnSessionBean/AppleTree.java | 2 +- .../methodOnSessionBean/AppleTreeLocal.java | 2 +- .../DisposalMethodOnSessionBeanTest.java | 5 +- .../broken/enterprise/remoteMethod/Foo.java | 36 +-- .../enterprise/remoteMethod/FooDisposal.java | 60 ++-- .../remoteMethod/FooDisposalRemote.java | 46 ++-- .../RemoteBusinessDisposalMethodTest.java | 14 +- .../observes/async/BrokenFoodProducer.java | 6 +- .../DisposerMethodWithAsyncObservesTest.java | 2 +- .../definition/inheritance/ejb/Chicken.java | 79 +++--- .../definition/inheritance/ejb/Code.java | 66 ++--- .../ejb/DisposerMethodInheritanceTest.java | 8 +- .../definition/inheritance/ejb/Egg.java | 64 ++--- .../definition/inheritance/ejb/Guru.java | 68 ++--- .../inheritance/ejb/Programmer.java | 79 +++--- .../genericStateless/DingoLocal_Broken.java | 2 +- .../broken/genericStateless/Dingo_Broken.java | 2 +- .../GenericStatelessSessionBeanTest.java | 2 +- .../Husky_Broken.java | 46 ++-- .../SingletonWithConversationScopeTest.java | 2 +- .../Greyhound_Broken.java | 46 ++-- .../SingletonWithRequestScopeTest.java | 2 +- .../IrishTerrier_Broken.java | 60 ++-- .../SingletonWithSessionScopeTest.java | 2 +- .../BulldogLocal_Broken.java | 2 +- .../statelessDecorator/Bulldog_Broken.java | 2 +- .../broken/statelessDecorator/Colie.java | 2 +- ...atorAnnotatedStatelessSessionBeanTest.java | 2 +- .../broken/statelessDecorator/Dog.java | 2 +- .../DalmatianLocal_Broken.java | 2 +- .../Dalmatian_Broken.java | 2 +- ...ptorAnnotatedStatelessSessionBeanTest.java | 2 +- .../DachshundLocal_Broken.java | 2 +- .../Dachshund_Broken.java | 46 ++-- .../StatelessWithApplicationScopeTest.java | 2 +- .../BoxerLocal_Broken.java | 2 +- .../Boxer_Broken.java | 46 ++-- .../StatelessWithConversationScopeTest.java | 2 +- .../BeagleLocal_Broken.java | 2 +- .../Beagle_Broken.java | 46 ++-- .../StatelessWithRequestScopeTest.java | 2 +- .../BullmastiffLocal_Broken.java | 2 +- .../Bullmastiff_Broken.java | 46 ++-- .../StatelessWithSessionScopeTest.java | 2 +- .../enterprise/definition/Ape.java | 2 +- .../enterprise/definition/ApeLocal.java | 2 +- .../enterprise/definition/Dog.java | 2 +- .../enterprise/definition/DogLocal.java | 2 +- .../enterprise/definition/Elephant.java | 2 +- .../enterprise/definition/ElephantLocal.java | 2 +- .../EnterpriseBeanDefinitionTest.java | 16 +- .../definition/EnterpriseBeanViaXmlTest.java | 7 +- .../definition/ExplicitConstructor.java | 2 +- .../ExplicitConstructorSessionBean.java | 2 +- .../enterprise/definition/Giraffe.java | 2 +- .../enterprise/definition/GiraffeLocal.java | 2 +- .../enterprise/definition/Labrador.java | 2 +- .../enterprise/definition/Laika.java | 44 +-- .../enterprise/definition/Lion.java | 2 +- .../enterprise/definition/LionLocal.java | 2 +- .../enterprise/definition/Monkey.java | 2 +- .../enterprise/definition/MonkeyLocal.java | 2 +- .../enterprise/definition/Pitbull.java | 68 ++--- .../enterprise/definition/PitbullLocal.java | 2 +- .../enterprise/definition/Polar.java | 2 +- .../enterprise/definition/PolarBear.java | 2 +- .../enterprise/definition/PolarBearLocal.java | 2 +- .../enterprise/definition/Retriever.java | 4 +- .../enterprise/definition/SimpleBean.java | 2 +- .../enterprise/definition/Tame.java | 2 +- .../definition/remote/DogLocal.java | 2 +- .../definition/remote/DogRemote.java | 2 +- .../enterprise/definition/remote/Pitbull.java | 56 ++-- .../RemoteInterfaceNotInAPITypesTest.java | 1 - .../enterprise/definition/remote/Tame.java | 46 ++-- .../enterprise/lifecycle/AlteStadt.java | 2 +- .../lifecycle/DirectOrderProcessor.java | 42 +-- .../lifecycle/DirectOrderProcessorLocal.java | 42 +-- .../EnterpriseBeanLifecycleTest.java | 24 +- .../enterprise/lifecycle/FrankfurtAmMain.java | 2 +- .../lifecycle/GeschichtslosStadt.java | 2 +- .../enterprise/lifecycle/Giessen.java | 2 +- .../enterprise/lifecycle/GrossStadt.java | 2 +- .../enterprise/lifecycle/GutenbergMuseum.java | 2 +- .../enterprise/lifecycle/Heidelburg.java | 2 +- .../enterprise/lifecycle/Important.java | 2 +- .../lifecycle/IndirectOrderProcessor.java | 40 +-- .../lifecycle/IntermediateOrderProcessor.java | 34 +-- .../enterprise/lifecycle/Kassel.java | 2 +- .../enterprise/lifecycle/KleinStadt.java | 2 +- .../lifecycle/LandgraffenSchloss.java | 2 +- .../enterprise/lifecycle/Mainz.java | 2 +- .../enterprise/lifecycle/Marburg.java | 2 +- .../enterprise/lifecycle/NeueStadt.java | 2 +- .../enterprise/lifecycle/OrderProcessor.java | 76 +++--- .../lifecycle/OrderProcessorLocal.java | 42 +-- .../enterprise/lifecycle/RoemerPassage.java | 2 +- .../enterprise/lifecycle/Schloss.java | 2 +- .../enterprise/lifecycle/SchoeneStadt.java | 2 +- .../enterprise/lifecycle/UniStadt.java | 2 +- .../remove/DependentSessionBean.java | 2 +- .../remove/DependentSessionInterface.java | 2 +- .../EnterpriseBeanRemoveMethodTest.java | 4 +- .../remove/SessionScopedSessionBean.java | 2 +- .../remove/SessionScopedSessionInterface.java | 2 +- .../enterprise/remove/StateKeeper.java | 6 +- .../initializer/ejb/AndalusianChicken.java | 2 +- .../ejb/EjbInitializerMethodTest.java | 4 +- .../initializer/ejb/LocalChicken.java | 2 +- .../enterprise/nonstatic/FooLocal_Broken.java | 2 +- .../enterprise/nonstatic/Foo_Broken.java | 2 +- .../NonStaticFieldOfSessionBeanTest.java | 2 +- .../field/definition/enterprise/Chicken.java | 54 ++-- .../definition/enterprise/ChickenLocal.java | 42 +-- .../field/definition/enterprise/Egg.java | 64 ++--- ...EnterpriseProducerFieldDefinitionTest.java | 7 +- .../field/definition/enterprise/Foo.java | 72 ++--- .../broken/enterprise/nonbusiness/Foo.java | 36 +-- .../enterprise/nonbusiness/FooProducer.java | 50 ++-- .../nonbusiness/FooProducerLocal.java | 42 +-- .../ProducerMethodNotBusinessMethodTest.java | 5 +- .../broken/enterprise/remoteMethod/Foo.java | 36 +-- .../enterprise/remoteMethod/FooProducer.java | 52 ++-- .../remoteMethod/FooProducerRemote.java | 46 ++-- .../RemoteBusinessProducerMethodTest.java | 14 +- .../enterprise/AndalusianChicken.java | 46 ++-- .../enterprise/AndalusianChickenLocal.java | 42 +-- .../method/definition/enterprise/Apple.java | 50 ++-- .../definition/enterprise/AppleTree.java | 52 ++-- .../definition/enterprise/AppleTreeLocal.java | 42 +-- .../method/definition/enterprise/Chicken.java | 54 ++-- .../definition/enterprise/ChickenLocal.java | 42 +-- .../method/definition/enterprise/Egg.java | 52 ++-- ...nterpriseProducerMethodDefinitionTest.java | 3 +- .../enterprise/GrannySmithAppleTree.java | 2 +- .../definition/enterprise/LightYellow.java | 66 ++--- .../enterprise/LightYellowPearTree.java | 2 +- .../enterprise/LightYellowPearTreeLocal.java | 2 +- .../method/definition/enterprise/Pear.java | 2 +- .../definition/enterprise/PearTree.java | 2 +- .../definition/enterprise/PearTreeLocal.java | 2 +- .../definition/enterprise/YellowPearTree.java | 2 +- .../method/definition/enterprise/Yummy.java | 70 ++--- .../definition/ee/EnterpriseBeanObserver.java | 1 + .../definition/ee/MockEnterpriseBean.java | 6 +- .../simple/definition/ee/MockServlet.java | 2 +- .../ee/MockServletContextListener.java | 2 +- .../ee/MockServletRequestListener.java | 2 +- .../simple/definition/ee/MockUIComponent.java | 2 +- .../simple/ee/components/Ping.java | 1 - .../simple/ee/components/Tame.java | 2 +- .../simple/ee/components/Wild.java | 2 +- .../simple/resource/broken/name/Another.java | 66 ++--- .../simple/resource/broken/type/Another.java | 66 ++--- .../simple/resource/broken/type/ejb/Bean.java | 2 +- .../resource/broken/type/ejb/BeanRemote.java | 2 +- .../simple/resource/broken/type/ejb/Lazy.java | 68 ++--- ...sourceDefinitionWithDifferentTypeTest.java | 3 +- .../broken/type/ejb/ResourceProducer.java | 2 +- .../resource/broken/type/env/Greeting.java | 2 +- ...sourceDefinitionWithDifferentTypeTest.java | 3 +- .../broken/type/env/ResourceProducer.java | 2 +- .../type/persistence/context/Database.java | 2 +- .../persistence/context/ResourceProducer.java | 2 +- .../type/persistence/unit/Database.java | 2 +- .../persistence/unit/ResourceProducer.java | 2 +- .../simple/resource/ejb/AnotherInterface.java | 2 +- .../simple/resource/ejb/Bean.java | 8 +- .../simple/resource/ejb/BeanRemote.java | 2 +- .../simple/resource/ejb/EjbInjectionTest.java | 4 +- .../simple/resource/ejb/Lazy.java | 72 ++--- .../simple/resource/ejb/ManagedBean.java | 2 +- .../simple/resource/ejb/Monitor.java | 6 +- .../simple/resource/ejb/ResourceProducer.java | 2 +- .../resource/ejb/staticProducer/Bean.java | 2 +- .../resource/ejb/staticProducer/Lazy.java | 68 ++--- .../ejb/staticProducer/ManagedBean.java | 2 +- .../ejb/staticProducer/ResourceProducer.java | 2 +- .../simple/resource/env/EnvInjectionTest.java | 13 +- .../simple/resource/env/Greeting.java | 2 +- .../simple/resource/env/GreetingBean.java | 2 +- .../simple/resource/env/ResourceProducer.java | 2 +- .../EnvInjectionStaticProducerFieldTest.java | 8 +- .../resource/env/staticProducer/Greeting.java | 2 +- .../env/staticProducer/GreetingBean.java | 2 +- .../env/staticProducer/ResourceProducer.java | 2 +- .../resource/persistenceContext/Database.java | 2 +- .../persistenceContext/ManagedBean.java | 2 +- .../PersistenceContextInjectionTest.java | 13 +- .../persistenceContext/ResourceProducer.java | 2 +- .../staticProducer/Database.java | 2 +- .../staticProducer/ManagedBean.java | 2 +- ...tenceInjectionStaticProducerFieldTest.java | 4 +- .../staticProducer/ResourceProducer.java | 2 +- .../simple/resource/resource/Another.java | 72 ++--- .../resource/InjectionOfResourceTest.java | 6 +- .../simple/resource/resource/ManagedBean.java | 2 +- .../resource/staticProducer/Another.java | 66 ++--- ...tionOfResourceStaticProducerFieldTest.java | 2 +- .../resource/staticProducer/ManagedBean.java | 2 +- .../inheritance/initializer/AppleEjb.java | 2 +- .../tests/inheritance/initializer/Cheap.java | 2 +- .../tests/inheritance/initializer/Citrus.java | 2 +- .../inheritance/initializer/CitrusEjb.java | 2 +- .../inheritance/initializer/Expensive.java | 2 +- .../inheritance/initializer/FirstLevel.java | 2 +- .../tests/inheritance/initializer/Fruit.java | 2 +- .../inheritance/initializer/FruitEjb.java | 2 +- .../InitializerMethodInheritanceTest.java | 4 +- .../tests/inheritance/initializer/Lemon.java | 2 +- .../tests/inheritance/initializer/Orange.java | 2 +- .../inheritance/initializer/OrangeEjb.java | 2 +- .../initializer/PriceProducer.java | 2 +- .../inheritance/initializer/SecondLevel.java | 2 +- .../specialization/enterprise/Animal.java | 36 +-- .../specialization/enterprise/Building.java | 2 +- .../enterprise/BuildingLocal.java | 2 +- .../EnterpriseBeanSpecializationTest.java | 6 +- .../enterprise/FarmEquipment.java | 2 +- .../specialization/enterprise/Farmer.java | 2 +- .../enterprise/FarmerLocal.java | 2 +- .../specialization/enterprise/Landowner.java | 72 ++--- .../specialization/enterprise/Lazy.java | 68 ++--- .../specialization/enterprise/LazyFarmer.java | 2 +- .../enterprise/LazyFarmerLocal.java | 2 +- .../specialization/enterprise/Office.java | 2 +- .../enterprise/OfficeLocal.java | 2 +- .../enterprise/TractorLocal.java | 2 +- .../specialization/enterprise/Waste.java | 2 +- .../specialization/enterprise/Yard.java | 2 +- .../enterprise/YardInterface.java | 2 +- .../DirectlyExtendsSimpleBeanTest.java | 4 +- .../extend/managedbean/FarmEquipment.java | 2 +- .../extend/managedbean/TractorLocal.java | 2 +- .../extend/managedbean/Tractor_Broken.java | 2 +- .../extend/nothing/CowLocal_Broken.java | 2 +- .../broken/extend/nothing/Cow_Broken.java | 2 +- .../nothing/DirectlyExtendsNothingTest.java | 4 +- .../broken/extend/sessionbean/Mock.java | 40 +-- ...ializingSessionBeanWithClientViewTest.java | 6 +- .../broken/name/FarmYard_Broken.java | 2 +- .../enterprise/broken/name/Yard.java | 2 +- .../enterprise/broken/name/YardInterface.java | 2 +- .../enterprise/broken/twobeans/Farmer.java | 2 +- .../broken/twobeans/FarmerInterface.java | 2 +- .../broken/twobeans/FishFarmer_Broken.java | 2 +- .../enterprise/broken/twobeans/Landowner.java | 66 ++--- .../broken/twobeans/SheepFarmer_Broken.java | 2 +- .../TwoBeansSpecializeTheSameBeanTest.java | 2 +- ...priseProducerMethodSpecializationTest.java | 6 +- .../producer/method/enterprise/Expensive.java | 72 ++--- .../method/enterprise/JewelryShop.java | 2 +- .../producer/method/enterprise/Necklace.java | 2 +- .../producer/method/enterprise/Product.java | 2 +- .../producer/method/enterprise/Shop.java | 2 +- .../producer/method/enterprise/Sparkly.java | 72 ++--- .../broken/extendejb/FarmEquipment.java | 2 +- .../broken/extendejb/FarmEquipmentLocal.java | 2 +- ...ializingBeanExtendsEnterpriseBeanTest.java | 4 +- .../broken/extendejb/Tractor_Broken.java | 2 +- .../FinalClassMethodLevelInterceptorTest.java | 4 +- .../FinalMethodClassLevelInterceptorTest.java | 2 +- .../ee/FinalMethodClassLevelMissile.java | 3 +- .../ee/FinalMethodClassLevelMissileLocal.java | 2 +- ...FinalMethodMethodLevelInterceptorTest.java | 2 +- .../ee/FinalMethodMethodLevelMissile.java | 3 +- .../FinalMethodMethodLevelMissileLocal.java | 2 +- .../enterprise/interceptorOrder/Airborne.java | 2 +- .../enterprise/interceptorOrder/Missile.java | 2 +- .../interceptorOrder/MissileInterceptor.java | 2 +- .../interceptorOrder/MissileLocal.java | 2 +- .../interceptorOrder/RadarInterceptor.java | 2 +- .../SessionBeanInterceptorOrderTest.java | 2 +- ...geDrivenBeanInterceptorInvocationTest.java | 10 +- .../definition/enterprise/jms/Missile.java | 2 +- .../enterprise/jms/MissileInterceptor.java | 6 +- .../enterprise/jms/SimpleMessageProducer.java | 3 +- .../nonContextualReference/Airborne.java | 2 +- .../nonContextualReference/Anchor.java | 2 +- .../AnchorInterceptor.java | 2 +- .../nonContextualReference/Cruiser.java | 2 +- .../nonContextualReference/Missile.java | 2 +- .../MissileInterceptor.java | 2 +- .../nonContextualReference/MissileLocal.java | 2 +- .../nonContextualReference/Ship.java | 2 +- .../nonContextualReference/Waterborne.java | 2 +- .../simpleInterception/Airborne.java | 2 +- .../simpleInterception/Missile.java | 2 +- .../MissileInterceptor.java | 2 +- .../simpleInterception/MissileLocal.java | 2 +- .../SessionBeanInterceptorDefinitionTest.java | 1 + .../definition/inheritance_ee/Cactus.java | 2 +- .../definition/inheritance_ee/Culinary.java | 12 +- .../definition/inheritance_ee/European.java | 12 +- .../definition/inheritance_ee/Flower.java | 2 +- .../inheritance_ee/ForgetMeNot.java | 2 +- .../inheritance_ee/GuardedBySquirrel.java | 12 +- .../inheritance_ee/GuardedByWoodpecker.java | 12 +- .../InterceptorBindingInheritanceTest.java | 26 +- .../definition/inheritance_ee/Opuncia.java | 2 +- .../definition/inheritance_ee/Ping.java | 2 +- .../definition/inheritance_ee/Plant.java | 2 +- .../definition/inheritance_ee/PongPlant.java | 2 +- .../definition/inheritance_ee/Shrub.java | 2 +- .../inheritance_ee/SquirrelInterceptor.java | 2 +- .../definition/inheritance_ee/Tree.java | 2 +- .../inheritance_ee/WoodForgetMeNot.java | 2 +- .../inheritance_ee/WoodpeckerInterceptor.java | 2 +- .../lifecycle/enterprise/order/Airborne.java | 2 +- .../enterprise/order/AnotherInterceptor.java | 2 +- ...iseLifecycleInterceptorDefinitionTest.java | 7 +- .../lifecycle/enterprise/order/Missile.java | 2 +- .../enterprise/order/MissileInterceptor.java | 2 +- .../ejb/InterceptorInvocationTest.java | 10 +- .../tck/tests/interceptors/ejb/Timing.java | 3 +- .../EnterpriseInterceptorOrderingTest.java | 9 +- .../global/GlobalInterceptorOrderingTest.java | 9 +- .../lookup/clientProxy/incontainer/Car.java | 2 +- .../incontainer/ClientProxyTest.java | 2 +- .../clientProxy/incontainer/Garage.java | 2 +- .../clientProxy/incontainer/TestServlet.java | 2 +- .../integration/ClientProxyTest.java | 16 +- .../lookup/clientProxy/integration/Fox.java | 2 +- .../lookup/clientProxy/integration/Tuna.java | 2 +- .../clientProxy/integration/TunedTuna.java | 2 +- ...uleSessionBeanAmbiguousDependencyTest.java | 2 +- .../IntegrationWithUnifiedELTest.java | 2 +- .../tests/lookup/el/integration/Sheep.java | 2 +- .../lookup/injection/MegaPoorHenHouse.java | 42 +-- .../tests/lookup/injection/PoorHenHouse.java | 45 +-- .../lookup/injection/ejb/DeluxeHenHouse.java | 6 +- .../tests/lookup/injection/ejb/HenHouse.java | 1 + .../injection/enterprise/DeluxeHenHouse.java | 2 +- .../enterprise/DeluxeHenHouseLocal.java | 2 +- .../lookup/injection/enterprise/Farm.java | 2 +- .../injection/enterprise/FarmInterceptor.java | 2 +- .../injection/enterprise/FarmLocal.java | 2 +- .../lookup/injection/enterprise/Fox.java | 2 +- .../lookup/injection/enterprise/HenHouse.java | 2 +- .../enterprise/InjectedSessionBean.java | 2 +- .../enterprise/InjectedSessionBeanLocal.java | 2 +- .../enterprise/MegaPoorHenHouse.java | 2 +- .../enterprise/MegaPoorHenHouseLocal.java | 2 +- .../injection/enterprise/PoorHenHouse.java | 2 +- .../SessionBeanInjectionOrderingTest.java | 5 +- .../enterprise/SessionBeanInjectionTest.java | 14 +- .../lookup/injection/enterprise/Sheep.java | 2 +- .../enterprise/SuperInjectedSessionBean.java | 2 +- .../chain/SessionBeanInjectionChainTest.java | 2 +- ...CreationalContextForNonContextualTest.java | 2 +- .../lookup/injection/non/contextual/Farm.java | 2 +- ...jectionIntoNonContextualComponentTest.java | 50 ++-- .../injection/non/contextual/Sheep.java | 2 +- .../non/contextual/TagLibraryListener.java | 2 +- .../non/contextual/TestListener.java | 2 +- .../non/contextual/TestTagHandler.java | 2 +- ...jectionIntoNonContextualComponentTest.java | 2 +- .../broken/ambiguous/TestServlet.java | 2 +- .../broken/unsatisfied/TestServlet.java | 2 +- ...jectionIntoNonContextualComponentTest.java | 2 +- .../persistence/SpecialPersistor.java | 2 +- .../broken/not/bean/TestServlet_Broken.java | 2 +- .../injectionpoint/non/contextual/Foo.java | 2 +- .../NonContextualInjectionPointTest.java | 3 +- .../manager/jndi/JndiBeanManagerInjected.java | 3 +- .../lookup/manager/provider/init/Alpha.java | 2 +- .../lookup/manager/provider/init/Bar.java | 2 +- .../lookup/manager/provider/init/Baz.java | 2 +- .../lookup/manager/provider/init/Bravo.java | 2 +- .../provider/init/CDIProviderInitTest.java | 1 + .../lookup/manager/provider/init/Charlie.java | 2 +- .../lookup/manager/provider/init/Foo.java | 2 +- .../lookup/manager/provider/init/Marker.java | 2 +- .../provider/init/MarkerObtainerBda1.java | 2 +- .../provider/init/MarkerObtainerBda2.java | 2 +- .../provider/init/MarkerObtainerNonBda.java | 2 +- .../provider/init/MarkerObtainerWar.java | 2 +- .../manager/provider/runtime/Alpha.java | 2 +- .../provider/runtime/AlphaLocator.java | 2 +- .../manager/provider/runtime/Bravo.java | 2 +- .../provider/runtime/BravoLocator.java | 2 +- .../manager/provider/runtime/BravoMarker.java | 2 +- .../runtime/CDIProviderRuntimeTest.java | 4 +- .../manager/provider/runtime/Powerful.java | 66 ++--- .../provider/runtime/PowerfulLiteral.java | 2 +- .../cdi/tck/tests/lookup/modules/Bar.java | 2 +- .../tck/tests/lookup/modules/CashEjbFoo.java | 2 +- .../cdi/tck/tests/lookup/modules/CashFoo.java | 2 +- .../cdi/tck/tests/lookup/modules/EjbFoo.java | 2 +- .../tck/tests/lookup/modules/EjbFooLocal.java | 2 +- ...anagedBeanInjectionAvailability02Test.java | 12 +- ...dManagedBeanInjectionAvailabilityTest.java | 7 +- ...ducerFieldInjectionAvailability02Test.java | 5 +- ...ucerMethodInjectionAvailability02Test.java | 5 +- ...essionBeanInjectionAvailability02Test.java | 3 +- ...dSessionBeanInjectionAvailabilityTest.java | 4 +- .../tck/tests/lookup/modules/Enterprise.java | 68 ++--- .../cdi/tck/tests/lookup/modules/Foo.java | 2 +- .../lookup/modules/FooFieldProducer.java | 2 +- .../lookup/modules/FooMethodProducer.java | 2 +- .../modules/InterModuleELResolutionTest.java | 4 +- .../lookup/modules/InterModuleLookupTest.java | 4 +- .../tck/tests/lookup/modules/ManagedFoo.java | 2 +- .../tests/lookup/modules/PaymentEjbFoo.java | 2 +- .../tck/tests/lookup/modules/PaymentFoo.java | 2 +- .../tck/tests/lookup/modules/ProducedFoo.java | 2 +- ...anagedBeanInjectionAvailability02Test.java | 6 +- ...eManagedBeanInjectionAvailabilityTest.java | 7 +- ...essionBeanInjectionAvailability02Test.java | 6 +- ...eSessionBeanInjectionAvailabilityTest.java | 8 +- ...ucerMethodInjectionNotAvailable02Test.java | 6 +- .../tck/tests/lookup/modules/Standard.java | 2 +- .../cdi/tck/tests/lookup/modules/WebBar.java | 2 +- .../lookup/modules/WebFooELResolver.java | 4 +- .../tests/lookup/modules/WebFooLookup.java | 2 +- .../tests/lookup/modules/WebPaymentBar.java | 2 +- .../lookup/modules/WebPaymentEjbBar.java | 2 +- .../lookup/modules/broken/BrokenBar.java | 2 +- .../lookup/modules/broken/BrokenFoo.java | 2 +- .../modules/broken/BrokenProducedFoo.java | 2 +- .../lookup/modules/broken/BrokenWebBar.java | 2 +- .../lookup/modules/broken/DisabledEjbFoo.java | 2 +- .../broken/DisabledFooFieldProducer.java | 2 +- .../broken/DisabledFooMethodProducer.java | 2 +- ...roducerFieldInjectionNotAvailableTest.java | 2 +- ...oducerMethodInjectionNotAvailableTest.java | 2 +- ...dSessionBeanInjectionNotAvailableTest.java | 4 +- .../lookup/modules/broken/EjbFooLocal.java | 2 +- .../modules/interceptors/BarBinding.java | 2 +- .../lookup/modules/interceptors/Dog.java | 4 +- .../InterceptorModularityTest.java | 5 +- .../SpecializationModularity01Test.java | 13 +- .../SpecializationModularity02Test.java | 11 +- .../SpecializationModularity03Test.java | 11 +- .../SpecializationModularity04Test.java | 11 +- .../SpecializationModularity05Test.java | 11 +- .../SpecializationModularity06Test.java | 11 +- .../SpecializationModularity07Test.java | 17 +- .../alternative/Specialization01Test.java | 14 +- .../alternative/Specialization02Test.java | 18 +- .../alternative/Specialization03Test.java | 20 +- .../alternative/Specialization04Test.java | 17 +- .../alternative/Specialization05Test.java | 15 +- .../alternative/Specialization06Test.java | 9 +- .../interceptor/ejb/Capercaillie.java | 2 +- .../interceptor/ejb/CapercaillieLocal.java | 2 +- .../ejb/EnterpriseResolutionByTypeTest.java | 2 +- .../interceptor/ejb/ScottishBirdLocal.java | 3 +- .../tck/tests/vetoed/enterprise/Elephant.java | 2 +- .../vetoed/enterprise/ElephantLocal.java | 2 +- .../tck/tests/vetoed/enterprise/Gecko.java | 4 +- .../vetoed/enterprise/ModifyingExtension.java | 2 +- .../vetoed/enterprise/VerifyingExtension.java | 2 +- .../vetoed/enterprise/aquarium/Piranha.java | 2 +- .../enterprise/aquarium/package-info.java | 1 - .../cdi/tck/test/ExclusionListsTest.java | 19 +- .../cdi/tck/test/porting/DummyContexts.java | 1 + .../tck/test/porting/DummyContextuals.java | 1 + .../test/porting/DummyCreationalContexts.java | 1 + .../jboss/cdi/tck/test/porting/DummyEL.java | 4 +- .../ejb/EjbJarDescriptorBuilderTest.java | 3 +- 3773 files changed, 18872 insertions(+), 17821 deletions(-) diff --git a/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java b/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java index ed7148cacb..51e50a1376 100644 --- a/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java +++ b/api/src/main/java/org/jboss/cdi/tck/api/Configuration.java @@ -104,7 +104,8 @@ public interface Configuration { public void setEl(EL el); /** - * The TCK allows additional libraries to be put in the deployed test artifacts (for example the porting package for the implementation). Any jars in this + * The TCK allows additional libraries to be put in the deployed test artifacts (for example the porting package for the + * implementation). Any jars in this * directory will be added to the deployed artifact. * * By default no directory is used. @@ -116,7 +117,8 @@ public interface Configuration { public void setLibraryDirectory(String libraryDir); /** - * Few TCK tests need to work with Java EE services related to persistence (JPA, JTA) - test datasource must be provided. These tests belong to testng group + * Few TCK tests need to work with Java EE services related to persistence (JPA, JTA) - test datasource must be provided. + * These tests belong to testng group * persistence. * * @return the JNDI name of the test datasource @@ -163,7 +165,8 @@ public interface Configuration { public void setTestJmsTopic(String testJmsTopic); /** - * All tests using some timeout technique (e.g. wait for async processing) should use this value to adjust the final timeout so that it's possible to configure timeouts + * All tests using some timeout technique (e.g. wait for async processing) should use this value to adjust the final timeout + * so that it's possible to configure timeouts * according to the testing runtime performance and throughput. * * @return the test timeout factor (in percent) diff --git a/api/src/main/java/org/jboss/cdi/tck/spi/Beans.java b/api/src/main/java/org/jboss/cdi/tck/spi/Beans.java index c4ee2d38b3..7b03c649ae 100644 --- a/api/src/main/java/org/jboss/cdi/tck/spi/Beans.java +++ b/api/src/main/java/org/jboss/cdi/tck/spi/Beans.java @@ -1,58 +1,58 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.spi; - -import java.io.IOException; - -/** - * Provides Bean related operations. - * - * The TCK porting package must provide an implementation of this interface which is suitable for the target implementation. - * - * This interface may be removed. - * - * @author Shane Bryzak - * @author Pete Muir - * @author David Allen - * - */ -public interface Beans { - - public static final String PROPERTY_NAME = Beans.class.getName(); - - /** - * Determines if the object instance is actually a proxy object. - * - * @param instance The object which might be a proxy - * @return true if the object is a proxy - */ - public boolean isProxy(Object instance); - - /** - * Passivates the object tree starting with the bean instance provided. - * - * @param instance The bean instance to serialize - * @return the serialized byte array of the bean instance - */ - public byte[] passivate(Object instance) throws IOException; - - /** - * Activates a bean instance from the given serialized bytes. - * - * @param bytes The serialized byte stream of a bean instance - * @return the serialized byte array of the bean instance - */ - public Object activate(byte[] bytes) throws IOException, ClassNotFoundException; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.spi; + +import java.io.IOException; + +/** + * Provides Bean related operations. + * + * The TCK porting package must provide an implementation of this interface which is suitable for the target implementation. + * + * This interface may be removed. + * + * @author Shane Bryzak + * @author Pete Muir + * @author David Allen + * + */ +public interface Beans { + + public static final String PROPERTY_NAME = Beans.class.getName(); + + /** + * Determines if the object instance is actually a proxy object. + * + * @param instance The object which might be a proxy + * @return true if the object is a proxy + */ + public boolean isProxy(Object instance); + + /** + * Passivates the object tree starting with the bean instance provided. + * + * @param instance The bean instance to serialize + * @return the serialized byte array of the bean instance + */ + public byte[] passivate(Object instance) throws IOException; + + /** + * Activates a bean instance from the given serialized bytes. + * + * @param bytes The serialized byte stream of a bean instance + * @return the serialized byte array of the bean instance + */ + public Object activate(byte[] bytes) throws IOException, ClassNotFoundException; + +} diff --git a/api/src/main/java/org/jboss/cdi/tck/spi/Contexts.java b/api/src/main/java/org/jboss/cdi/tck/spi/Contexts.java index 0e45419710..1a5c07ca14 100644 --- a/api/src/main/java/org/jboss/cdi/tck/spi/Contexts.java +++ b/api/src/main/java/org/jboss/cdi/tck/spi/Contexts.java @@ -1,74 +1,74 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.spi; - -import jakarta.enterprise.context.spi.Context; - -/** - * This interface provides operations relating to Contexts. - * - * The TCK porting package must provide an implementation of this interface which is suitable for the target implementation. - * - * @author Shane Bryzak - * @author Pete Muir - * - * @param The concrete context type of the implementation - * - */ -public interface Contexts { - - public static final String PROPERTY_NAME = Contexts.class.getName(); - - /** - * Sets the specified context as active. - *

- * The set of existing contextual instances of the context is preserved - * across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}. - * - * @param context The context to set active - */ - public void setActive(T context); - - /** - * Sets the specified context as inactive. - *

- * The set of existing contextual instances of the context is preserved - * across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}. - * - * @param context The context to set inactive - */ - public void setInactive(T context); - - /** - * Get the request context, regardless of whether it is active or not - * - * @return The request context - */ - public T getRequestContext(); - - /** - * Returns the dependent context, regardless of whether it is active or not - * - * @return the dependent context - */ - public T getDependentContext(); - - /** - * Destroy the context. This operation is defined by the CDI specification but has no API. - * - * @param context the context to destroy - */ - public void destroyContext(T context); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.spi; + +import jakarta.enterprise.context.spi.Context; + +/** + * This interface provides operations relating to Contexts. + * + * The TCK porting package must provide an implementation of this interface which is suitable for the target implementation. + * + * @author Shane Bryzak + * @author Pete Muir + * + * @param The concrete context type of the implementation + * + */ +public interface Contexts { + + public static final String PROPERTY_NAME = Contexts.class.getName(); + + /** + * Sets the specified context as active. + *

+ * The set of existing contextual instances of the context is preserved + * across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}. + * + * @param context The context to set active + */ + public void setActive(T context); + + /** + * Sets the specified context as inactive. + *

+ * The set of existing contextual instances of the context is preserved + * across invocations of {@link #setActive(Context)} and {@link #setInactive(Context)}. + * + * @param context The context to set inactive + */ + public void setInactive(T context); + + /** + * Get the request context, regardless of whether it is active or not + * + * @return The request context + */ + public T getRequestContext(); + + /** + * Returns the dependent context, regardless of whether it is active or not + * + * @return the dependent context + */ + public T getDependentContext(); + + /** + * Destroy the context. This operation is defined by the CDI specification but has no API. + * + * @param context the context to destroy + */ + public void destroyContext(T context); + +} diff --git a/api/src/main/java/org/jboss/cdi/tck/spi/EL.java b/api/src/main/java/org/jboss/cdi/tck/spi/EL.java index 56d9465374..0ca7fa863f 100644 --- a/api/src/main/java/org/jboss/cdi/tck/spi/EL.java +++ b/api/src/main/java/org/jboss/cdi/tck/spi/EL.java @@ -47,7 +47,8 @@ public interface EL { * @param expectedParamTypes * @return */ - public T evaluateMethodExpression(BeanManager beanManager, String expression, Class expectedType, Class[] expectedParamTypes, + public T evaluateMethodExpression(BeanManager beanManager, String expression, Class expectedType, + Class[] expectedParamTypes, Object[] expectedParams); /** diff --git a/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Strict.java b/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Strict.java index d6ab9ca037..47a03cf1b3 100644 --- a/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Strict.java +++ b/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Strict.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/StrictLiteral.java b/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/StrictLiteral.java index 7eaff1efc8..d3bfab239e 100644 --- a/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/StrictLiteral.java +++ b/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/StrictLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Translator.java b/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Translator.java index 1abcd45407..8e5f819310 100644 --- a/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Translator.java +++ b/ext-lib/src/main/java/org/jboss/cdi/tck/extlib/Translator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ @Strict @Dependent public class Translator { - + public String echo(String text) { return text; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/AbstractTest.java b/impl/src/main/java/org/jboss/cdi/tck/AbstractTest.java index 2db6e143f8..72ff88b928 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/AbstractTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/AbstractTest.java @@ -170,15 +170,15 @@ protected Set> getBeans(TypeLiteral type, Annotation... bindings) } protected T getContextualReference(Class beanType, Annotation... qualifiers) { - return BeanLookupUtils.getContextualReference(getCurrentManager(), beanType, qualifiers); + return BeanLookupUtils. getContextualReference(getCurrentManager(), beanType, qualifiers); } protected T getContextualReference(TypeLiteral beanType, Annotation... qualifiers) { - return BeanLookupUtils.getContextualReference(getCurrentManager(), beanType, qualifiers); + return BeanLookupUtils. getContextualReference(getCurrentManager(), beanType, qualifiers); } protected T getContextualReference(String name, Class beanType) { - return BeanLookupUtils.getContextualReference(getCurrentManager(), name, beanType); + return BeanLookupUtils. getContextualReference(getCurrentManager(), name, beanType); } protected DependentInstance newDependentInstance(Class beanType, Annotation... qualifiers) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java b/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java index 48e5b7b54f..bb566ab592 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java +++ b/impl/src/main/java/org/jboss/cdi/tck/TestGroups.java @@ -87,13 +87,13 @@ public final class TestGroups { /** * Requires following mapping of roles to principals: - * -------------------------------- - * | Principal | Group | - * -------------------------------- - * | student | student | - * | alarm | student, alarm | - * | printer | printer | - * -------------------------------- + * -------------------------------- + * | Principal | Group | + * -------------------------------- + * | student | student | + * | alarm | student, alarm | + * | printer | printer | + * -------------------------------- */ public static final String SECURITY = "security"; diff --git a/impl/src/main/java/org/jboss/cdi/tck/impl/ConfigurationImpl.java b/impl/src/main/java/org/jboss/cdi/tck/impl/ConfigurationImpl.java index 83b7db271f..dfd0e18112 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/impl/ConfigurationImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/impl/ConfigurationImpl.java @@ -152,7 +152,7 @@ public int getTestTimeoutFactor() { @Override public void setTestTimeoutFactor(int timeoutFactor) { - if(timeoutFactor <= 0) { + if (timeoutFactor <= 0) { throw new IllegalArgumentException("Test timeout factor must be greater than zero"); } this.testTimeoutFactor = timeoutFactor; diff --git a/impl/src/main/java/org/jboss/cdi/tck/impl/PropertiesBasedConfigurationBuilder.java b/impl/src/main/java/org/jboss/cdi/tck/impl/PropertiesBasedConfigurationBuilder.java index 42089dbbbe..e85293839e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/impl/PropertiesBasedConfigurationBuilder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/impl/PropertiesBasedConfigurationBuilder.java @@ -13,13 +13,6 @@ */ package org.jboss.cdi.tck.impl; -import org.jboss.cdi.tck.api.Configuration; -import org.jboss.cdi.tck.spi.Beans; -import org.jboss.cdi.tck.spi.Contexts; -import org.jboss.cdi.tck.spi.Contextuals; -import org.jboss.cdi.tck.spi.CreationalContexts; -import org.jboss.cdi.tck.spi.EL; - import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -28,6 +21,13 @@ import java.util.Properties; import java.util.Set; +import org.jboss.cdi.tck.api.Configuration; +import org.jboss.cdi.tck.spi.Beans; +import org.jboss.cdi.tck.spi.Contexts; +import org.jboss.cdi.tck.spi.Contextuals; +import org.jboss.cdi.tck.spi.CreationalContexts; +import org.jboss.cdi.tck.spi.EL; + /** * CDI TCK configuration builder. * @@ -64,20 +64,23 @@ public PropertiesBasedConfigurationBuilder init(boolean deploymentPhase) { configuration.setBeans(getInstanceValue(Beans.PROPERTY_NAME, Beans.class, !deploymentPhase)); configuration.setEl(getInstanceValue(EL.PROPERTY_NAME, EL.class, !deploymentPhase)); - configuration.setContexts((Contexts)getInstanceValue(Contexts.PROPERTY_NAME, Contexts.class, !deploymentPhase)); + configuration.setContexts((Contexts) getInstanceValue(Contexts.PROPERTY_NAME, Contexts.class, !deploymentPhase)); configuration.setContextuals(getInstanceValue(Contextuals.PROPERTY_NAME, Contextuals.class, !deploymentPhase)); - configuration.setCreationalContexts(getInstanceValue(CreationalContexts.PROPERTY_NAME, CreationalContexts.class, !deploymentPhase)); + configuration.setCreationalContexts( + getInstanceValue(CreationalContexts.PROPERTY_NAME, CreationalContexts.class, !deploymentPhase)); configuration.setLibraryDirectory(getStringValue(Configuration.LIBRARY_DIRECTORY_PROPERTY_NAME, null, deploymentPhase)); if (!configuration.getCdiLiteMode()) { configuration.setTestDataSource(getStringValue(Configuration.TEST_DATASOURCE_PROPERTY_NAME, null, deploymentPhase)); - configuration.setTestJmsConnectionFactory(getStringValue(Configuration.TEST_JMS_CONNECTION_FACTORY, null, deploymentPhase)); + configuration.setTestJmsConnectionFactory( + getStringValue(Configuration.TEST_JMS_CONNECTION_FACTORY, null, deploymentPhase)); configuration.setTestJmsQueue(getStringValue(Configuration.TEST_JMS_QUEUE, null, deploymentPhase)); configuration.setTestJmsTopic(getStringValue(Configuration.TEST_JMS_TOPIC, null, deploymentPhase)); } - configuration.setTestTimeoutFactor(getIntegerValue(Configuration.TEST_TIMEOUT_FACTOR, Configuration.TEST_TIMEOUT_FACTOR_DEFAULT_VALUE, false)); + configuration.setTestTimeoutFactor( + getIntegerValue(Configuration.TEST_TIMEOUT_FACTOR, Configuration.TEST_TIMEOUT_FACTOR_DEFAULT_VALUE, false)); return this; } @@ -267,38 +270,41 @@ protected Class getClassValue(String propertyName, Class expectedType, classes.add((Class) Class.forName(className)); } - } catch (ClassNotFoundException|LinkageError e) { - throw new IllegalArgumentException("Implementation class with name " + className + " not found using classloader " + } catch (ClassNotFoundException | LinkageError e) { + throw new IllegalArgumentException("Implementation class with name " + className + + " not found using classloader " + (currentThreadClassLoader != null ? currentThreadClassLoader : this.getClass().getClassLoader()), e); } } if (classes.size() == 0) { if (required) { - throw new IllegalArgumentException("Cannot find any implementations of " + expectedType.getSimpleName() + ", check that " + propertyName - + " is specified"); + throw new IllegalArgumentException( + "Cannot find any implementations of " + expectedType.getSimpleName() + ", check that " + propertyName + + " is specified"); } else { return null; } } else if (classes.size() > 1) { - throw new IllegalArgumentException("More than one implementation of " + expectedType.getSimpleName() + " specified by " + propertyName - + ", not sure which one to use!"); + throw new IllegalArgumentException( + "More than one implementation of " + expectedType.getSimpleName() + " specified by " + propertyName + + ", not sure which one to use!"); } else { return classes.iterator().next(); } } - private String getValue(String propertyName, boolean required) { Set values = getPropertyValues(propertyName); if (values.size() == 0) { if (required) { throw new IllegalArgumentException("Cannot find required property " + propertyName - + ", check that it is specified. See cdiLiteMode flag if testing CDI Lite."); + + ", check that it is specified. See cdiLiteMode flag if testing CDI Lite."); } return null; } else if (values.size() > 1) { - throw new IllegalArgumentException("More than one value given for " + propertyName + ", not sure which one to use!"); + throw new IllegalArgumentException( + "More than one value given for " + propertyName + ", not sure which one to use!"); } else { return values.iterator().next(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ConfigurationLoggingListener.java b/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ConfigurationLoggingListener.java index f8b9d5db71..883e07162f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ConfigurationLoggingListener.java +++ b/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ConfigurationLoggingListener.java @@ -41,8 +41,10 @@ public void onStart(ISuite suite) { } catch (IOException e) { e.printStackTrace(); } - logger.log(Level.INFO, "CDI-TCK Implementation version: {0}", Package.getPackage("org.jboss.cdi.tck.impl.testng").getImplementationVersion()); - logger.log(Level.INFO, "CDI-TCK Specification version: {0}", Package.getPackage("org.jboss.cdi.tck.impl.testng").getSpecificationVersion()); + logger.log(Level.INFO, "CDI-TCK Implementation version: {0}", + Package.getPackage("org.jboss.cdi.tck.impl.testng").getImplementationVersion()); + logger.log(Level.INFO, "CDI-TCK Specification version: {0}", + Package.getPackage("org.jboss.cdi.tck.impl.testng").getSpecificationVersion()); Configuration conf = ConfigurationFactory.get(); logger.log(Level.INFO, conf.toString()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ProgressLoggingTestListener.java b/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ProgressLoggingTestListener.java index c700d42501..2f12be9857 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ProgressLoggingTestListener.java +++ b/impl/src/main/java/org/jboss/cdi/tck/impl/testng/ProgressLoggingTestListener.java @@ -65,7 +65,8 @@ public void beforeInvocation(IInvokedMethod method, ITestResult testResult, ITes logger.log(Level.INFO, "Invoke {0}.{1}: {2}/{3} Failed tests: {4} ({5})", new Object[] { method.getTestMethod().getTestClass().getRealClass().getSimpleName(), - method.getTestMethod().getMethodName(), testMethodInvocations.incrementAndGet(), totalCountOfMethods, context.getFailedTests().size(), + method.getTestMethod().getMethodName(), testMethodInvocations.incrementAndGet(), totalCountOfMethods, + context.getFailedTests().size(), processedTestClasses.get() }); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/impl/testng/SingleTestClassMethodInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/impl/testng/SingleTestClassMethodInterceptor.java index 345dcbd9e2..1b989fcb1a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/impl/testng/SingleTestClassMethodInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/impl/testng/SingleTestClassMethodInterceptor.java @@ -32,13 +32,15 @@ * This {@link IMethodInterceptor} fixes one or the other problem with CDI TCK test suite execution: *

    *
  • - * Run tests from single test class - it seems that Maven Surefire plugin is not able to run single test that is located outside src/test dir. If test class + * Run tests from single test class - it seems that Maven Surefire plugin is not able to run single test that is located outside + * src/test dir. If test class *
    • *
  • - * system property is set all test methods that don't belong to specified test class are excluded. + * system property is set all test methods that don't belong to specified test class are excluded. *
    • *
  • - * Avoid randomly mixed test method execution - causing test archive deployments collisions. If test class system property is not set group test methods by + * Avoid randomly mixed test method execution - causing test archive deployments collisions. If test class system property is + * not set group test methods by * test class. *
    • *
@@ -76,8 +78,9 @@ public List intercept(List methods, ITestConte return methods; } - logger.log(Level.INFO, "Intercepting... [methods: {0}, testRun: {1}, suiteName: {2}]", new Object[] { methods.size(), context.getName(), - context.getSuite().getName() }); + logger.log(Level.INFO, "Intercepting... [methods: {0}, testRun: {1}, suiteName: {2}]", + new Object[] { methods.size(), context.getName(), + context.getSuite().getName() }); long start = System.currentTimeMillis(); String testString = System.getProperty(TEST_CLASS_PROPERTY); diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/AbstractInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/AbstractInterceptor.java index ae0c45babb..d59f0cb9e0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/AbstractInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/AbstractInterceptor.java @@ -18,7 +18,6 @@ import org.jboss.cdi.tck.util.ActionSequence; - public abstract class AbstractInterceptor { @AroundConstruct diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java index 5b9c14610e..7fd24cd9ea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ConstructorInterceptionTest.java @@ -20,12 +20,12 @@ import static org.jboss.cdi.tck.util.ActionSequence.assertSequenceDataEquals; import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -66,7 +66,8 @@ public void testConstructorLevelBinding(Instance instance) { ActionSequence.reset(); instance.get(); - assertSequenceDataEquals(AlphaInterceptor2.class, BravoInterceptor.class, BeanWithMultipleConstructorLevelBinding.class); + assertSequenceDataEquals(AlphaInterceptor2.class, BravoInterceptor.class, + BeanWithMultipleConstructorLevelBinding.class); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @@ -84,7 +85,8 @@ public void testTypeLevelBinding(Instance instance) { public void testTypeLevelAndConstructorLevelBinding(Instance instance) { ActionSequence.reset(); instance.get(); - assertSequenceDataEquals(AlphaInterceptor1.class, BravoInterceptor.class, BeanWithConstructorLevelAndTypeLevelBinding.class); + assertSequenceDataEquals(AlphaInterceptor1.class, BravoInterceptor.class, + BeanWithConstructorLevelAndTypeLevelBinding.class); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Bar.java index 756a0bd3eb..f0dbdc2cb1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarBinding.java index 98e6c6a1ea..58de0b680c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarInterceptor.java index f23a02dd57..db2aba4651 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarStereotype.java index 2ee42d3d2e..216dde83a4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BarStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BazBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BazBinding.java index 1fc7097bd6..63eb83728e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BazBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/BazBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -35,6 +35,7 @@ ANSWER value(); public enum ANSWER { - YES, NO; + YES, + NO; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Foo.java index 48e953f32b..633bde698c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooBinding.java index 28f518ad14..fa4f9ea6e4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooInterceptor.java index deaa41269f..5a55cf5475 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooStereotype.java index f53931aed4..de30ebd340 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/FooStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java index 3d2ac2a4aa..28dd8aae39 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidStereotypeInterceptorBindingAnnotationsTest.java @@ -16,12 +16,12 @@ import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_BINDING_TYPES_WITH_MEMBERS; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java index 3d7d0e2050..7c1e30ad37 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/InvalidTransitiveInterceptorBindingAnnotationsTest.java @@ -16,12 +16,12 @@ import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_BINDING_TYPES_WITH_MEMBERS; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/NoBazInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/NoBazInterceptor.java index 9c17dfac52..835fb81855 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/NoBazInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/NoBazInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/YesBazInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/YesBazInterceptor.java index 833dd1cdc2..dd4f584728 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/YesBazInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/broken/YesBazInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/AnimalCountInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/AnimalCountInterceptorBinding.java index 35e82d0ec0..ee02d4c485 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/AnimalCountInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/AnimalCountInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,6 +31,7 @@ Operation value(); enum Operation { - INCREASE, DECREASE + INCREASE, + DECREASE } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Farm.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Farm.java index bdf85bd469..4e4c6b6662 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Farm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Farm.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.interceptors.tests.bindings.members; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.interceptors.tests.bindings.members.AnimalCountInterceptorBinding.Operation; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java index 4a8d8dfbc7..6e6a973d31 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/InterceptorBindingTypeWithMemberTest.java @@ -18,20 +18,20 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.util.List; + import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - /** * Tests for interceptor bindings types with members. * diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Plant.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Plant.java index 4a59cc9756..c699e42236 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Plant.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/Plant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptor.java index 61bb98a74b..bde113afd8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptorBinding.java index d5d5786fb0..45e6832be1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/PlantInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptor.java index dfdb079fe7..3b7a394705 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptorBinding.java index ec742c3e3d..97923254fc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/members/VehicleCountInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Deadly.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Deadly.java index 7615bc3a4c..0498dc52e6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Deadly.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Deadly.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Fast.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Fast.java index 60460259fd..2569c7764e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Fast.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Fast.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/FastAndDeadlyMissile.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/FastAndDeadlyMissile.java index b4d78ba8f9..c9882d11d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/FastAndDeadlyMissile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/FastAndDeadlyMissile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/GuidedMissile.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/GuidedMissile.java index 35494286ba..235a5e47db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/GuidedMissile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/GuidedMissile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/LockInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/LockInterceptor.java index 9ec983fbfe..e35ae47b33 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/LockInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/LockInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Missile.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Missile.java index 5784fdffd1..13d8fec517 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Missile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MissileInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MissileInterceptor.java index 6f906ce332..7308378f0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MissileInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java index 6978a9a841..bbd01fb6f3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/MultipleInterceptorBindingsTest.java @@ -22,7 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Slow.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Slow.java index 8cc0bd8206..1378fab772 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Slow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/Slow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/SlowMissile.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/SlowMissile.java index 95b440de07..a577f807f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/SlowMissile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/multiple/SlowMissile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Aging.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Aging.java index 5e0fa761e8..f0a377fd32 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Aging.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Aging.java @@ -35,6 +35,7 @@ Speed value(); public enum Speed { - FAST, SLOW; + FAST, + SLOW; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/InterceptorBindingOverridingTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/InterceptorBindingOverridingTest.java index b476337b20..b980171bb0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/InterceptorBindingOverridingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/InterceptorBindingOverridingTest.java @@ -19,11 +19,11 @@ import static org.testng.Assert.assertEquals; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Pony.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Pony.java index 0c179361e8..092a8b9660 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Pony.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/overriding/Pony.java @@ -15,6 +15,7 @@ package org.jboss.cdi.tck.interceptors.tests.bindings.overriding; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.interceptors.tests.bindings.overriding.Aging.Speed; @Aging(Speed.FAST) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBinding.java index bcb17f9836..96a680ae84 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBindingLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBindingLiteral.java index 4fd83d135c..1e42168546 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBindingLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BallBindingLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBinding.java index 2986263d93..739d6f0d70 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBindingLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBindingLiteral.java index 78088e04b3..bb62ef0c51 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBindingLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/BasketBindingLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedAroundConstructInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedAroundConstructInterceptor.java index 28c67d0312..8b8e46c9c0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedAroundConstructInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedAroundConstructInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedInterceptor.java index 33c564ef90..4c27eb2d0f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedLifecycleInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedLifecycleInterceptor.java index 3d408c557b..e7249706be 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedLifecycleInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ComplicatedLifecycleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 3b2ab2f83a..61518f4121 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 8d8ebc1e27..4cfc5a281a 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d83164524c..b0e0c67463 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 @@ -27,15 +27,11 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.InterceptionType; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -75,7 +71,8 @@ public void testBusinessMethodInterceptorBindings(MessageService messageService, new TransactionalBinding.Literal(), new PingBinding.Literal(), new PongBinding.Literal(), - new BallBindingLiteral(true, true)).size(), 1); + new BallBindingLiteral(true, true)).size(), + 1); // Test the set of interceptor bindings assertNotNull(messageService); @@ -101,13 +98,15 @@ public void testLifecycleInterceptorBindings() { new MessageBinding.Literal(), new LoggedBinding.Literal(), new TransactionalBinding.Literal(), - new BasketBindingLiteral(true, true)).size(), 1); + new BasketBindingLiteral(true, true)).size(), + 1); assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.PRE_DESTROY, new MessageBinding.Literal(), new LoggedBinding.Literal(), new TransactionalBinding.Literal(), - new BasketBindingLiteral(true, true)).size(), 1); + new BasketBindingLiteral(true, true)).size(), + 1); // Test the set of interceptor bindings ComplicatedLifecycleInterceptor.reset(); @@ -121,7 +120,7 @@ public void testLifecycleInterceptorBindings() { assertTrue(ComplicatedLifecycleInterceptor.postConstructCalled); assertTrue(ComplicatedLifecycleInterceptor.preDestroyCalled); } - + @SuppressWarnings("serial") @Test @SpecAssertion(section = INT_RESOLUTION, id = "b") @@ -135,7 +134,8 @@ public void testConstructorInterceptorBindings() { new LoggedBinding.Literal(), new TransactionalBinding.Literal(), new ConstructorBinding.Literal(), - new CreativeBinding.Literal()).size(), 1); + 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 6836cb9e64..304ddb0bb3 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 da960e7f76..b05fa6707d 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 5d291b5b5f..aea008e723 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 eaafb83406..57aad6e9b1 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 2635ac8cea..8d8d82d6e0 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/RemoteService.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/RemoteService.java index 4004eb6149..e7bb613c58 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/RemoteService.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/RemoteService.java @@ -14,7 +14,6 @@ package org.jboss.cdi.tck.interceptors.tests.bindings.resolution; - import jakarta.enterprise.context.Dependent; @LoggedBinding diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ServiceStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ServiceStereotype.java index cfd9dcd32b..cea40d04a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ServiceStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ServiceStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 c739adc4fc..0f62befe7e 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AlphaBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AlphaBinding.java index 735c1619a9..40df74f08d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AlphaBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AlphaBinding.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundConstruct; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, CONSTRUCTOR }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AroundConstructTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AroundConstructTest.java index 0a7768015b..4f7a888960 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AroundConstructTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/AroundConstructTest.java @@ -54,9 +54,9 @@ public static WebArchive createTestArchive() { @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertion(section = CONSTRUCTOR_AND_METHOD_LEVEL_INT, id = "ab") - @SpecAssertion(section = INVOCATIONCONTEXT, id = "c") - @SpecAssertion(section = INVOCATIONCONTEXT, id = "eb") - @SpecAssertion(section = INVOCATIONCONTEXT, id = "f") + @SpecAssertion(section = INVOCATIONCONTEXT, id = "c") + @SpecAssertion(section = INVOCATIONCONTEXT, id = "eb") + @SpecAssertion(section = INVOCATIONCONTEXT, id = "f") @SpecAssertion(section = INT_METHODS_FOR_LIFECYCLE_EVENT_CALLBACKS, id = "a") @SpecAssertion(section = ASSOCIATING_INT_USING_INTERCEPTORS_ANNOTATION, id = "c") public void testInterceptorInvocation(Instance instance) { @@ -66,7 +66,7 @@ public void testInterceptorInvocation(Instance instance) { } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertion(section = INVOCATIONCONTEXT, id = "ga") + @SpecAssertion(section = INVOCATIONCONTEXT, id = "ga") public void testReplacingParameters(Instance instance) { ActionSequence.reset(); Bravo bravo = instance.get(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/BravoBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/BravoBinding.java index b9c6753a64..81db86a08d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/BravoBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/BravoBinding.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundConstruct; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, CONSTRUCTOR }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/Charlie.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/Charlie.java index 09f9287583..c3358ecaaa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/Charlie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/Charlie.java @@ -14,7 +14,6 @@ package org.jboss.cdi.tck.interceptors.tests.contract.aroundConstruct; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.Interceptors; @CharlieBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieBinding.java index 05c3cdc62f..6bc278ef7d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieBinding.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundConstruct; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieInterceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieInterceptor1.java index f8dd058fb0..ee65261675 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieInterceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/CharlieInterceptor1.java @@ -20,7 +20,6 @@ import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; - @Interceptor @CharlieBinding @Priority(100) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AlphaBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AlphaBinding.java index 64742032f6..477f8022de 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AlphaBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AlphaBinding.java @@ -27,7 +27,7 @@ @InterceptorBinding @Inherited -@Target({ TYPE, METHOD, CONSTRUCTOR}) +@Target({ TYPE, METHOD, CONSTRUCTOR }) @Retention(RUNTIME) @Documented public @interface AlphaBinding { diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AroundConstructTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AroundConstructTest.java index 2dd0d70515..5439e07148 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AroundConstructTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundConstruct/bindings/AroundConstructTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.fail; import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/AroundInvokeAccessInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/AroundInvokeAccessInterceptorTest.java index a1cfcebc4f..d9f04d1a66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/AroundInvokeAccessInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/AroundInvokeAccessInterceptorTest.java @@ -16,7 +16,6 @@ import static org.jboss.cdi.tck.interceptors.InterceptorsSections.BUSINESS_METHOD_INTERCEPTOR_METHODS; import static org.testng.Assert.assertEquals; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean1.java index a0dc30508a..6d43f15c42 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean2.java index 80e01b8d15..9aadbdbfb3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean3.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean3.java index d5bda8ac9d..d2dae9fe1e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/Bean3.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateBinding.java index 10efdd8233..ab0af1edaf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateBinding.java @@ -13,19 +13,19 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited -@Target({ TYPE, METHOD}) +@Target({ TYPE, METHOD }) @Retention(RUNTIME) public @interface PackagePrivateBinding { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateInterceptor.java index c8217b4eed..063acaa6ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PackagePrivateInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateBinding.java index 2bab65e5ba..47e7b55f7c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateBinding.java @@ -13,19 +13,19 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited -@Target({ TYPE, METHOD}) +@Target({ TYPE, METHOD }) @Retention(RUNTIME) public @interface PrivateBinding { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateInterceptor.java index cd6e421a59..dc600dca75 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/PrivateInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedBinding.java index 99bf10a0f7..950fb0524a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedBinding.java @@ -13,19 +13,19 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited -@Target({ TYPE, METHOD}) +@Target({ TYPE, METHOD }) @Retention(RUNTIME) public @interface ProtectedBinding { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedInterceptor.java index 08b936947a..15db6341ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ProtectedInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/SimpleBean.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/SimpleBean.java index 0ec021973d..00a736dae4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/SimpleBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/SimpleBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/Binding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/Binding.java index 1819cd6a43..318a35e525 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/Binding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/Binding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/ExceptionBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/ExceptionBinding.java index 27562adc1b..560115007e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/ExceptionBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/ExceptionBinding.java @@ -13,19 +13,19 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.exceptions.aroundInvoke; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited -@Target({ TYPE, METHOD}) +@Target({ TYPE, METHOD }) @Retention(RUNTIME) public @interface ExceptionBinding { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor1.java index 8192b8060a..9d5935e2bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor2.java index 38fc207261..f5d70069fc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor3.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor3.java index d6c127a3f9..8df08cdfd8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor3.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor4.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor4.java index 481b61a53e..e042ebd95f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor4.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/Interceptor4.java @@ -25,6 +25,6 @@ public class Interceptor4 { @AroundInvoke public Object intercept(InvocationContext ctx) throws Exception { ExceptionBean.failFirstTwoInvocations(); - return ! (Boolean) ctx.proceed(); + return !(Boolean) ctx.proceed(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/SimpleBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/SimpleBinding.java index 2caf7cc7b2..16253ec736 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/SimpleBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/exceptions/aroundInvoke/SimpleBinding.java @@ -13,18 +13,18 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.exceptions.aroundInvoke; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited -@Target({ TYPE}) +@Target({ TYPE }) @Retention(RUNTIME) public @interface SimpleBinding { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AroundInvokeInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AroundInvokeInterceptor.java index a55f7fa985..c1ca85978d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AroundInvokeInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AroundInvokeInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AttackBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AttackBinding.java index 297b70eefc..8c05fd8570 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AttackBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/AttackBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Bar.java index 344e517abc..37fffffbc5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Baz.java index 96619238eb..c4b93e8cdf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,6 @@ import jakarta.enterprise.context.Dependent; import jakarta.inject.Inject; -import jakarta.interceptor.Interceptors; @BazBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/BazBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/BazBinding.java index fa6231b106..410c8a2772 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/BazBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/BazBinding.java @@ -13,6 +13,8 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -20,9 +22,6 @@ import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodBinding.java index 08f16145f0..319d2899ef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodBinding.java @@ -6,13 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -20,10 +24,6 @@ import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodInterceptor.java index 1bb30b2198..10b8df839d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/MethodInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PostConstructInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PostConstructInterceptor.java index 882bf29cc1..cbc89eb8fa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PostConstructInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PostConstructInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PreDestroyInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PreDestroyInterceptor.java index 3e0d5b5ba4..64ff7934d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PreDestroyInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/PreDestroyInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Warrior.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Warrior.java index 815170d867..a641580705 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Warrior.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Warrior.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,6 @@ import jakarta.enterprise.context.Dependent; import jakarta.inject.Inject; -import jakarta.interceptor.Interceptors; @WarriorBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAIInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAIInterceptor.java index 46cdc9269e..257390f9f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAIInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAIInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAttackAIInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAttackAIInterceptor.java index 17d4954a9f..3c600f46ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAttackAIInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorAttackAIInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorBinding.java index cc7d4c49a1..8103c59f12 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPCInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPCInterceptor.java index 20f72e26f4..a5bd36da29 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPCInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPCInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPDInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPDInterceptor.java index 380c8e170a..7266f532f9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPDInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WarriorPDInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,11 +24,11 @@ public class WarriorPDInterceptor { public static int count = 0; - + public WarriorPDInterceptor() { count++; } - + @PreDestroy public void intercept(InvocationContext ctx) { try { diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Weapon.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Weapon.java index 90bebf6e1c..aa27aaad2b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Weapon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/Weapon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ @Dependent public class Weapon { - + private WeaponAIInterceptor wi; @WeaponBinding @@ -27,7 +27,7 @@ public void use() { public WeaponAIInterceptor getWI() { return wi; } - + public void setWI(WeaponAIInterceptor wi) { this.wi = wi; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponAIInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponAIInterceptor.java index 290bf761be..c84c76c9a5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponAIInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponAIInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponBinding.java index 2c18c7237e..14e546257e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/WeaponBinding.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Bar.java index 62cbc61d5a..1144703a66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz.java index c736d499fc..ed78b85cfa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,6 @@ import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.Dependent; import jakarta.inject.Inject; -import jakarta.interceptor.Interceptors; @Dependent public class Baz { @@ -38,7 +37,7 @@ public boolean injectionPerformedCorrectly() { } @PostConstruct - public void postConstruct(){ + public void postConstruct() { postConstructedCalled = true; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz1Interceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz1Interceptor.java index e962915e96..ad24359b2f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz1Interceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz1Interceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz2Interceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz2Interceptor.java index d9d6a12f28..47d0c4f716 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz2Interceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Baz2Interceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/BazBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/BazBinding.java index 067199f3d0..395ff4c4a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/BazBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/BazBinding.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.aroundConstruct; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -20,10 +23,6 @@ import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, CONSTRUCTOR }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Foo.java index f2f41e0850..dd41b8d1ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooBinding.java index 6e8b1dd483..86e8795be4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooCommonInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooCommonInterceptor.java index 55c710f5f3..cd8b910c7b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooCommonInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooCommonInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooInterceptor.java index 8d347af65a..46e5ad11a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooSuperInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooSuperInterceptor.java index b74f811d18..ff3c99a1de 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooSuperInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/FooSuperInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/Foo.java index 8b3bc6244e..af0f98d87a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/Foo.java @@ -21,12 +21,11 @@ public class Foo { private String name; - public Foo(){ + public Foo() { this.name = "default"; } - - public Foo(String name){ + public Foo(String name) { this.name = name; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/FooBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/FooBinding.java index 1caf9191e0..2da1a6170a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/FooBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/returnValueIgnored/FooBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/Foo.java index 99b0573bef..2dd110286d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/Foo.java @@ -19,7 +19,7 @@ @Dependent public class Foo { - public int ping(){ + public int ping() { return 0; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/FooBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/FooBinding.java index 80df93627a..0cb4c4d464 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/FooBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/aroundConstruct/withAroundInvoke/FooBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding1.java index 8ac44eb4b0..48b6def3db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding1.java @@ -13,17 +13,17 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding2.java index c20e6c2b7a..2492cea34d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructBinding2.java @@ -13,17 +13,17 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor1.java index b5fa99cefa..ca81680e37 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor1.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import java.lang.annotation.Annotation; +import java.util.Set; + import jakarta.annotation.Priority; import jakarta.interceptor.AroundConstruct; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import java.lang.annotation.Annotation; -import java.util.Set; - @Interceptor @AroundConstructBinding1 @Priority(100) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor2.java index d8a707f167..2a36d08c32 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/AroundConstructInterceptor2.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import java.lang.annotation.Annotation; +import java.util.Set; + import jakarta.annotation.Priority; import jakarta.interceptor.AroundConstruct; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import java.lang.annotation.Annotation; -import java.util.Set; - @Interceptor @AroundConstructBinding2 @Priority(200) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding1.java index 121aadba1a..d0e2e7fe94 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding1.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding10.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding10.java index c203a06c3d..2018e43f5a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding10.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding10.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding11.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding11.java index 3e82862afb..72ca28e08c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding11.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding11.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding12.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding12.java index c9dfcc062c..19b6320934 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding12.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding12.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding13.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding13.java index 3646dabf48..e412759175 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding13.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding13.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding14.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding14.java index d844396bd2..5f7f6381c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding14.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding14.java @@ -13,17 +13,17 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.enterprise.util.Nonbinding; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15.java index 660b1e757b..3c3dffbc5c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15.java @@ -29,5 +29,6 @@ @Retention(RUNTIME) public @interface Binding15 { - public class Literal extends AnnotationLiteral implements Binding15 {} + public class Literal extends AnnotationLiteral implements Binding15 { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15Additional.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15Additional.java index b16e20b593..0256e39d24 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15Additional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding15Additional.java @@ -31,13 +31,13 @@ String value(); public class Literal extends AnnotationLiteral implements Binding15Additional { - + private String value; - + public Literal(String value) { this.value = value; } - + @Override public String value() { return value; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding16.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding16.java index 847904082e..3b9e2b076a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding16.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding16.java @@ -13,17 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.enterprise.util.Nonbinding; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding2.java index b01dd91072..7439833e26 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding2.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding3.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding3.java index b8c14fdfc6..7e3bc78957 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding3.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding4.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding4.java index d7108fa499..b12befc095 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding4.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding4.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding5.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding5.java index ae62db7215..50b37feb59 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding5.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding5.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding6.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding6.java index a1bcb13aca..e81adfdeff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding6.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding6.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding7.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding7.java index 33d6158eaf..13b589f325 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding7.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Binding7.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor1.java index 144b6f861b..a4f432488c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor10.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor10.java index 1901597163..8170eff9e9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor10.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor10.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor12.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor12.java index 71efdaa31b..825bac5480 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor12.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor12.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import java.lang.annotation.Annotation; +import java.util.Set; + import jakarta.annotation.Priority; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import java.lang.annotation.Annotation; -import java.util.Set; - @Interceptor @Binding12 @Priority(1200) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor2.java index ba67cfd594..e6b7e7dcc8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor3.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor3.java index 89e45b8938..444a0dab30 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor3.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor4.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor4.java index 2440366097..98456139e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor4.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor4.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor5.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor5.java index 474f8069ca..47f672c52e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor5.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor5.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor6.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor6.java index aa679c71f9..3cf414aaff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor6.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor6.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor7.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor7.java index 9efc1c1982..8d49478b36 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor7.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor7.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor8.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor8.java index 89c508eb32..0e65c678bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor8.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor8.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor9.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor9.java index 56b251c982..8c1ff90500 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor9.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/Interceptor9.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/InvocationContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/InvocationContextTest.java index 7c378ac9ca..2534b0649d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/InvocationContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/InvocationContextTest.java @@ -18,9 +18,10 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; +import java.util.Set; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -29,8 +30,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - /** * Tests for the InvocationContext implementation * diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PostConstructInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PostConstructInterceptor.java index 7af4f70472..41a9c69ae6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PostConstructInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PostConstructInterceptor.java @@ -6,21 +6,21 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import java.lang.annotation.Annotation; +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.Priority; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import java.lang.annotation.Annotation; -import java.util.Set; - @Interceptor @SimplePCBinding @Priority(100) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PseudoBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PseudoBinding.java index 66030199a0..dda52ec93a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PseudoBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/PseudoBinding.java @@ -13,17 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.enterprise.util.Nonbinding; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; /** * This is an interceptor binding, but there is no matching interceptor. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBean.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBean.java index 35c409801d..6ca8d2e7f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBinding.java index 3e137014aa..19df213e17 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimpleBinding.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimplePCBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimplePCBinding.java index c94cfd9c15..cdea847c4d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimplePCBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SimplePCBinding.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -20,10 +23,6 @@ import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SuperBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SuperBinding.java index 3822115c89..4ef7fe29a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SuperBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/invocationContext/SuperBinding.java @@ -13,21 +13,22 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.invocationContext; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) @Retention(RUNTIME) public @interface SuperBinding { - class Literal extends AnnotationLiteral implements SuperBinding {} + class Literal extends AnnotationLiteral implements SuperBinding { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AlmightyLifecycleInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AlmightyLifecycleInterceptor.java index ba77c30e28..cd6b926377 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AlmightyLifecycleInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AlmightyLifecycleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Animal.java index 5941703d16..8ba01966b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalBinding.java index 7df4c26ca6..c3d873988a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalBinding.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalInterceptor.java index 6fa8fbf56f..b826138a28 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/AnimalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Bar.java index 10b7cda34d..7841c02998 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Chicken.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Chicken.java index 978402970d..fc0d6c694b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Chicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Chicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ChickenBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ChickenBinding.java index ae0eef3b2b..4091f5962b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ChickenBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ChickenBinding.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Cow.java index a636bcb657..228c374168 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,6 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.RequestScoped; -import jakarta.interceptor.Interceptors; @AnimalBinding @RequestScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Dog.java index 5f78ebdfa9..7c8e142ae7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,6 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.Interceptors; @DogBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/DogBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/DogBinding.java index 08a53ebe0f..c4352ae2f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/DogBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/DogBinding.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Goat.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Goat.java index e133d2a6f9..15aaa3a971 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Goat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Goat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,6 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.Interceptors; @AnimalBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Hen.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Hen.java index 6340306fb1..ec66d1045b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Hen.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Hen.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,6 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; -import jakarta.interceptor.Interceptors; @AnimalBinding @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PackagePrivateLifecycleInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PackagePrivateLifecycleInterceptor.java index 60c0f4677e..19917439db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PackagePrivateLifecycleInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PackagePrivateLifecycleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PrivateLifecycleInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PrivateLifecycleInterceptor.java index 0c91358af0..b82d40c30e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PrivateLifecycleInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PrivateLifecycleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ProtectedLifecycleInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ProtectedLifecycleInterceptor.java index e96c738ad5..7a59bf97b3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ProtectedLifecycleInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ProtectedLifecycleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PublicLifecycleInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PublicLifecycleInterceptor.java index f7fdbad753..7187e10a8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PublicLifecycleInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/PublicLifecycleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Sheep.java index 3f67116012..e184263587 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,7 +14,6 @@ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.Interceptors; @Dependent class Sheep { diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepBinding.java index 36a7db369a..234477c456 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepBinding.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepInterceptor.java index 103ee6378b..a9ea87c0ee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/SheepInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Airborne.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Airborne.java index 95589d6cf4..e84bb6dc3d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Airborne.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Airborne.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/AirborneInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/AirborneInterceptor.java index 8b51a2921f..913cf291ed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/AirborneInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/AirborneInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/DestructionInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/DestructionInterceptor.java index 38a76d136c..c8a55fc2ef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/DestructionInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/DestructionInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Destructive.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Destructive.java index 00df940800..773d5b32ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Destructive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Destructive.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Foo.java index 4e9592ab70..f8e50d4501 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/LifecycleInterceptorDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/LifecycleInterceptorDefinitionTest.java index ac311484bc..abcbf8e526 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/LifecycleInterceptorDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/LifecycleInterceptorDefinitionTest.java @@ -25,9 +25,6 @@ import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Missile.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Missile.java index 488f6be926..1c3bb1e500 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Missile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/SuperDestructionInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/SuperDestructionInterceptor.java index aa8aca66d8..9017023580 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/SuperDestructionInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/SuperDestructionInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Weapon.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Weapon.java index 90620e6674..0f309bd8eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Weapon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/Weapon.java @@ -16,13 +16,13 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; - import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.ActionSequence; /** * @author Martin Kouba - * + * */ @Dependent public class Weapon { diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Cat.java index 07314a1b84..a41e2dd775 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,6 @@ import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.Interceptors; @CatBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatBinding.java index cfe2da2488..4ae6299c46 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatBinding.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback.exceptions; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatInterceptor.java index e8c1ec84bd..f35d21fd96 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/CatInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Goat.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Goat.java index 635f2bc0d9..ff4d1fcae6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Goat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Goat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,6 @@ import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.Interceptors; @GoatBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatBinding.java index 8083dc9d16..8ac8b6fb95 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatBinding.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback.exceptions; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatInterceptor.java index 9de2b6a586..46aa895a8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/GoatInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Sheep.java index 5a20082ea9..09def6f3c8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/exceptions/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Foo.java index c5316dd057..eaf1cc62aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooClassBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooClassBinding.java index 4dc46208a8..3e7eac5122 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooClassBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooClassBinding.java @@ -6,22 +6,22 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.order.aroundConstruct; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooCtorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooCtorBinding.java index 5fccb1db0c..c94c335fb6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooCtorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/FooCtorBinding.java @@ -6,24 +6,23 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.order.aroundConstruct; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE, CONSTRUCTOR }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor1.java index c073a04af1..482a1962d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor2.java index 96ebf785d1..37ba693796 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor3.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor3.java index 16f08ac2c8..d9cc846f20 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor3.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor4.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor4.java index eab8a051bc..55665ab11b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor4.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/Interceptor4.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/MiddleInterceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/MiddleInterceptor1.java index 9afebf6fb7..636a95cec2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/MiddleInterceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/MiddleInterceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/SuperInterceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/SuperInterceptor1.java index 9affd7cc33..aedb2142bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/SuperInterceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundConstruct/SuperInterceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/OverridenInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/OverridenInterceptor.java index b00f3d8f75..0e78cd21fb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/OverridenInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/OverridenInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Tram.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Tram.java index 07abbd55ce..7f47bdde61 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Tram.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Tram.java @@ -17,7 +17,6 @@ import jakarta.enterprise.context.Dependent; import jakarta.interceptor.AroundInvoke; -import jakarta.interceptor.Interceptors; import jakarta.interceptor.InvocationContext; @TramClassBinding diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramClassBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramClassBinding.java index 35a679ee63..0e1baa6754 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramClassBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramClassBinding.java @@ -6,22 +6,22 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.order.aroundInvoke; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramCtorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramCtorBinding.java index d9b272ff18..97563531c2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramCtorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramCtorBinding.java @@ -6,23 +6,23 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.order.aroundInvoke; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.CONSTRUCTOR; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE, CONSTRUCTOR }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramMethodBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramMethodBinding.java index a6ae78cd13..c6104caf9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramMethodBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/TramMethodBinding.java @@ -6,23 +6,23 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.order.aroundInvoke; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Vehicle.java index 6d7f09cd5e..2da4b2d2c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/aroundInvoke/Vehicle.java @@ -6,18 +6,18 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.order.aroundInvoke; +import static org.testng.Assert.assertEquals; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.InvocationContext; -import static org.testng.Assert.assertEquals; - class Vehicle { @AroundInvoke public Object intercept(InvocationContext ctx) throws Exception { diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/CargoShip.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/CargoShip.java index afc39b288d..382c129187 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/CargoShip.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/CargoShip.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor1.java index 7f1af2de5d..b17f7034eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor2.java index f0b5fac8fe..fa210815f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor3.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor3.java index db3e9eee56..84b3a8c886 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor3.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor4.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor4.java index 7c72109d57..18496bb7fe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor4.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Interceptor4.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShip.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShip.java index 1f0047623e..3f50e845eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShip.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShip.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,6 @@ import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.Interceptors; @LakeCargoShipClassBinding @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShipClassBinding.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShipClassBinding.java index 75b93d94a2..ff03e464ae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShipClassBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/LakeCargoShipClassBinding.java @@ -6,22 +6,22 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.order.lifecycleCallback; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Ship.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Ship.java index 42fb85bf0e..9c63d8d2ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Ship.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/lifecycleCallback/Ship.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Bird.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Bird.java index b0eaf51972..024f40a7ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Bird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Bird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Eagle.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Eagle.java index 0ac1c6c1b1..1e878d7ba4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Eagle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Eagle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Falcon.java b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Falcon.java index 9f84eda8a0..a086bfcd56 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Falcon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/interceptors/tests/order/overriden/lifecycleCallback/Falcon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 index 3fa48a2cdd..17d421d742 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/literals/InheritedLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/literals/InheritedLiteral.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.literals; -import jakarta.enterprise.util.AnnotationLiteral; - import java.lang.annotation.Inherited; +import jakarta.enterprise.util.AnnotationLiteral; + 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/RetentionLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/literals/RetentionLiteral.java index b360f93a6f..d4a30dfc37 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/literals/RetentionLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/literals/RetentionLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @SuppressWarnings("all") public abstract class RetentionLiteral extends AnnotationLiteral implements Retention { diff --git a/impl/src/main/java/org/jboss/cdi/tck/literals/TargetLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/literals/TargetLiteral.java index 2c90c6fb1b..984e087f0a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/literals/TargetLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/literals/TargetLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @SuppressWarnings("all") public abstract class TargetLiteral extends AnnotationLiteral implements Target { diff --git a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java index 50a9fa2ff4..f6b3951c69 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/ArchiveBuilder.java @@ -13,8 +13,23 @@ */ package org.jboss.cdi.tck.shrinkwrap; +import java.io.File; +import java.io.FilenameFilter; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.spi.Extension; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.container.test.api.ShouldThrowException; @@ -50,33 +65,23 @@ import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType; import org.jboss.shrinkwrap.impl.BeansXml; -import java.io.File; -import java.io.FilenameFilter; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; - /** * Abstract ShrinkWrap archive builder for CDI TCK Arquillian test. *

- * This is a base class for builders that try to solve most JBoss Test Harness to Arquillian migration issues. The main goal was to use CDI TCK + * This is a base class for builders that try to solve most JBoss Test Harness to Arquillian migration issues. The + * main goal was to use CDI TCK * 1.0 tests with minimum code changes. *

*

- * Note that all Arquillian tests running in as-client mode (including tests using {@link ShouldThrowException}) must not contain testing related stuff - * (anything that depends on Arquillian, TestNG, incl. test class itself) since Arquillian is not enriching as-client test archives. That's why + * Note that all Arquillian tests running in as-client mode (including tests using {@link ShouldThrowException}) must not + * contain testing related stuff + * (anything that depends on Arquillian, TestNG, incl. test class itself) since Arquillian is not enriching as-client test + * archives. That's why * {@link #isAsClientMode} has to be properly set. *

*

- * In case of {@link #isTestArchive} set to false this archive may not include any testing related stuff as it is probably part of another test + * In case of {@link #isTestArchive} set to false this archive may not include any testing related stuff as it is + * probably part of another test * archive. *

* @@ -100,7 +105,8 @@ public abstract class ArchiveBuilder, A extends A private static final String INNER_CLASS_MARKER = "\\" + DOLLAR_SIGN; - private static final String INNER_CLASS_MATCH_PATTERN_BASE = ".*" + AssetUtil.DELIMITER_RESOURCE_PATH + "%s" + INNER_CLASS_MARKER + ".+\\.class"; + private static final String INNER_CLASS_MATCH_PATTERN_BASE = ".*" + AssetUtil.DELIMITER_RESOURCE_PATH + "%s" + + INNER_CLASS_MARKER + ".+\\.class"; private String name; @@ -288,9 +294,10 @@ public T withClasses(Class... classes) { } /** - * Specified class must be excluded from final archive unless also added via {@link #withClass(Class)} or {@link #withClasses(Class...)}. Useful for + * Specified class must be excluded from final archive unless also added via {@link #withClass(Class)} or + * {@link #withClasses(Class...)}. Useful for * exluding some classes from package added via {@link #withPackage(Package)}. - * + * * Avoid using this feature if possible - the implementation has negative performance effects. * * @param clazz Fully qualified class name @@ -305,9 +312,10 @@ public T withExcludedClass(String clazz) { } /** - * Specified classes must be excluded from final archive unless also added via {@link #withClass(Class)} or {@link #withClasses(Class...)}. Useful for + * Specified classes must be excluded from final archive unless also added via {@link #withClass(Class)} or + * {@link #withClasses(Class...)}. Useful for * exluding some classes from package added via {@link #withPackage(Package)}. - * + * * Avoid using this feature if possible - the implementation has negative performance effects. * * @param classes Fully qualified class names @@ -343,7 +351,7 @@ public T withTestClass(Class testClazz) { /** * Set test class definition for configuration purpose. Do not add it to final archive. - * + * * Always use this for as-client test archives, e.g. deployment method annotated with {@link ShouldThrowException}. * * @param testClazz @@ -525,7 +533,7 @@ public T withEjbJarXml(EjbJarDescriptor descriptor) { /** * Add web.xml located in src/main/resource/{testPackagePath}. - * + * *

* Do not use this in new tests - use {@link #withWebXml(WebAppDescriptor)} instead. *

@@ -598,7 +606,8 @@ public T withLibrary(File library) { } /** - * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of defined classes implements + * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of + * defined classes implements * {@link Extension} add corresponding service provider. * * @param beanClasses @@ -609,7 +618,8 @@ public T withBeanLibrary(Class... beanClasses) { } /** - * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of defined classes implements + * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of + * defined classes implements * {@link Extension} add corresponding service provider. * * @param beanClasses @@ -620,7 +630,8 @@ public T withBeanLibrary(BeansXml beansXml, Class... beanClasses) { } /** - * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of defined classes implements + * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of + * defined classes implements * {@link Extension} add corresponding service provider. * * @param beanClasses @@ -631,7 +642,8 @@ public T withBeanLibrary(String name, Class... beanClasses) { } /** - * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of defined classes implements + * Add bean library that consists of defined bean classes; automatically include empty beans.xml and if any of + * defined classes implements * {@link Extension} add corresponding service provider. * * @param beanClasses @@ -683,11 +695,13 @@ public T withLibrary(String name, BeansXml beansXml, boolean includeEmptyBeanXml extensions.add(clazz); } } - ServiceProviderDescriptor serviceProvider = extensions.isEmpty() ? null : new ServiceProviderDescriptor(Extension.class, - extensions.toArray(new Class[extensions.size()])); + ServiceProviderDescriptor serviceProvider = extensions.isEmpty() ? null + : new ServiceProviderDescriptor(Extension.class, + extensions.toArray(new Class[extensions.size()])); - this.libraries.add(beansXml != null ? new LibraryDescriptor(name, serviceProvider, beansXml, classes) : new LibraryDescriptor(name, - serviceProvider, includeEmptyBeanXml, classes)); + this.libraries.add(beansXml != null ? new LibraryDescriptor(name, serviceProvider, beansXml, classes) + : new LibraryDescriptor(name, + serviceProvider, includeEmptyBeanXml, classes)); return self(); } @@ -738,7 +752,8 @@ public T setAsClientMode(boolean isAsClientMode) { } /** - * @return true if TCK specific infrastructure (porting package, utils, etc.) should be automatically added, false otherwise + * @return true if TCK specific infrastructure (porting package, utils, etc.) should be automatically added, + * false otherwise * @see #resolveAsClientMode() */ public boolean isTestArchive() { @@ -746,7 +761,8 @@ public boolean isTestArchive() { } /** - * Mark this archive as non-testing. TCK specific infrastructure (porting package, utils, etc.) will not be automatically added. + * Mark this archive as non-testing. TCK specific infrastructure (porting package, utils, etc.) will not be automatically + * added. */ public T notTestArchive() { this.isTestArchive = false; @@ -804,7 +820,8 @@ public A build() { } logger.log(Level.INFO, "Test archive built [info: {0}, time: {1} ms]", - new Object[] { testClazz != null ? testClazz.getName() : archive.getName(), Long.valueOf(System.currentTimeMillis() - start) }); + new Object[] { testClazz != null ? testClazz.getName() : archive.getName(), + Long.valueOf(System.currentTimeMillis() - start) }); return archive; } @@ -815,7 +832,8 @@ public A build() { protected abstract A buildInternal(); /** - * Process packages. Exclude classes specified via {@link #withExcludedClass(String)}. If in as-client mode, filter test class. + * Process packages. Exclude classes specified via {@link #withExcludedClass(String)}. If in as-client mode, filter test + * class. * * @param archive */ @@ -863,7 +881,8 @@ else if (className.startsWith(exludeClassName) && className.contains("$")) if (classesPath != null) { ArchivePath classNamePath = AssetUtil.getFullPathForClassResource(className); - archive.add(new ClassLoaderAsset(classNamePath.get().substring(1), clToUse), ArchivePaths.create(classesPath, classNamePath)); + archive.add(new ClassLoaderAsset(classNamePath.get().substring(1), clToUse), + ArchivePaths.create(classesPath, classNamePath)); } else { archive.addClass(className); } @@ -905,7 +924,8 @@ protected

& ClassContainer> void processClasses(P archi classesPackage = clazz.getPackage(); } Asset resource = new ClassAsset(clazz); - ArchivePath location = ArchivePaths.create(resolveClassesPath(archive), AssetUtil.getFullPathForClassResource(clazz)); + ArchivePath location = ArchivePaths.create(resolveClassesPath(archive), + AssetUtil.getFullPathForClassResource(clazz)); archive.add(resource, location); } @@ -1142,7 +1162,8 @@ public LibraryDescriptor(File fileDescriptor) { this.fileDescriptor = fileDescriptor; } - public LibraryDescriptor(String name, ServiceProviderDescriptor serviceProvider, BeansXml beansDescriptor, Class... classes) { + public LibraryDescriptor(String name, ServiceProviderDescriptor serviceProvider, BeansXml beansDescriptor, + Class... classes) { super(); if (serviceProvider != null) { this.serviceProviders = new ArrayList(); @@ -1159,7 +1180,8 @@ public LibraryDescriptor(String name, ServiceProviderDescriptor serviceProvider, * @param includeEmptyBeanXml Automatically include empty beans.xml to promote the lib to BDA * @param classes */ - public LibraryDescriptor(String name, ServiceProviderDescriptor serviceProvider, boolean includeEmptyBeanXml, Class... classes) { + public LibraryDescriptor(String name, ServiceProviderDescriptor serviceProvider, boolean includeEmptyBeanXml, + Class... classes) { super(); if (serviceProvider != null) { this.serviceProviders = new ArrayList(); @@ -1213,7 +1235,8 @@ public JavaArchive buildJarArchive() { if (serviceProviders != null) { for (ServiceProviderDescriptor serviceProvider : serviceProviders) { - library.addAsServiceProvider(serviceProvider.getServiceInterface(), serviceProvider.getServiceImplementations()); + library.addAsServiceProvider(serviceProvider.getServiceInterface(), + serviceProvider.getServiceImplementations()); } } @@ -1229,7 +1252,8 @@ public JavaArchive buildJarArchive() { } /** - * Add default libraries from lib directory specified with org.jboss.cdi.tck.libraryDirectory property in cdi-tck.properties. + * Add default libraries from lib directory specified with org.jboss.cdi.tck.libraryDirectory property in + * cdi-tck.properties. */ private void addDefaultLibraries() { @@ -1255,7 +1279,8 @@ public boolean accept(File dir, String name) { } private boolean skipClassName(String className) { - return ((isAsClientMode() && testClazz.getName().equals(className)) || (excludedClasses != null && excludedClasses.contains(className))); + return ((isAsClientMode() && testClazz.getName().equals(className)) + || (excludedClasses != null && excludedClasses.contains(className))); } private boolean isSinglePackage(Set> classes) { @@ -1284,11 +1309,12 @@ private String getTestPackagePath() { /** * Try to resolve as-client mode automatically unless it was set already. - * + * * Set as-client mode to true provided that: *

    *
  • test class is annotated with {@link RunAsClient}
    • - *
  • the deployment method on test class definition is annotated with {@link ShouldThrowException} or {@link Deployment#testable()} is false
    • + *
  • the deployment method on test class definition is annotated with {@link ShouldThrowException} or + * {@link Deployment#testable()} is false
    • *
      * * @throws IllegalStateException If multiple deployments detected and as-client mode not set @@ -1315,7 +1341,8 @@ private void resolveAsClientMode() { } deploymentMethod = method; - if (method.isAnnotationPresent(ShouldThrowException.class) || !method.getAnnotation(Deployment.class).testable()) { + if (method.isAnnotationPresent(ShouldThrowException.class) + || !method.getAnnotation(Deployment.class).testable()) { setAsClientMode(true); } } @@ -1359,7 +1386,8 @@ private static JavaArchive buildIncontainerLibrary() { long start = System.currentTimeMillis(); - JavaArchive supportLib = ShrinkWrap.create(JavaArchive.class, "cdi-tck-incontainer.jar").addClasses(AbstractTest.class, Sections.class, + JavaArchive supportLib = ShrinkWrap.create(JavaArchive.class, "cdi-tck-incontainer.jar").addClasses(AbstractTest.class, + Sections.class, TestGroups.class); logger.log(Level.INFO, "Incontainer library built [time: {0} ms]", System.currentTimeMillis() - start); @@ -1385,7 +1413,7 @@ protected String getSha1OfTestClass() { for (int i = 0; i < digest.length; i++) { hexString.append(Integer.toHexString(0xFF & digest[i])); } - return testClazz.getSimpleName()+hexString.toString(); + return testClazz.getSimpleName() + hexString.toString(); } return null; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/URLPackageScanner.java b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/URLPackageScanner.java index 9ca2c31ce2..6fe3a4ce02 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/URLPackageScanner.java +++ b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/URLPackageScanner.java @@ -63,17 +63,17 @@ public class URLPackageScanner { * Factory method to create an instance of URLPackageScanner. * * @param addRecursively - * flag to add child packages + * flag to add child packages * @param classLoader - * class loader that will have classes added + * class loader that will have classes added * @param callback - * found class callback + * found class callback * @param packageName - * Package that will be scanned + * Package that will be scanned * @return new instance of URLPackageScanner */ public static URLPackageScanner newInstance(boolean addRecursively, final ClassLoader classLoader, - final Callback callback, final String packageName) { + final Callback callback, final String packageName) { validateNotNull(packageName, "Package name must be specified"); validateNotNull(classLoader, "ClassLoader must be specified"); @@ -86,11 +86,11 @@ public static URLPackageScanner newInstance(boolean addRecursively, final ClassL * Factory method to create an instance of URLPackageScanner in the default package * * @param addRecursively - * flag to add child packages + * flag to add child packages * @param classLoader - * class loader that will have classes added + * class loader that will have classes added * @param callback - * found class callback + * found class callback * @return new instance of URLPackageScanner */ public static URLPackageScanner newInstance(boolean addRecursively, ClassLoader classLoader, Callback callback) { @@ -140,7 +140,7 @@ private void handleArchiveByFile(File file) throws IOException, ClassNotFoundExc ZipEntry entry = entries.nextElement(); String name = entry.getName(); if (name.startsWith(packageNamePath) && name.endsWith(".class") - && (addRecursively || !name.substring(packageNamePath.length() + 1).contains("/"))) { + && (addRecursively || !name.substring(packageNamePath.length() + 1).contains("/"))) { String className = name.replace("/", ".").substring(0, name.length() - ".class".length()); foundClass(className); } @@ -193,7 +193,7 @@ public interface Callback { * Called for each found class. * * @param className - * The name of the found class + * The name of the found class */ void classFound(String className); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/WebArchiveBuilder.java b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/WebArchiveBuilder.java index fd2e7f9379..cc1050e403 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/WebArchiveBuilder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/WebArchiveBuilder.java @@ -34,7 +34,7 @@ public class WebArchiveBuilder extends ArchiveBuildernull and the beans.xml descriptor is placed in WEB-INF dir. However CDI 1.1 * allows an alternative location: WEB-INF/classes/META-INF. * @@ -77,7 +77,8 @@ protected WebArchive buildInternal() { // Deployment descriptors if (includeBeansXml) { - webArchive.addAsWebInfResource(getBeansDescriptorAsset(), buildBeansDescriptorTargetPath(getBeansDescriptorTarget())); + webArchive.addAsWebInfResource(getBeansDescriptorAsset(), + buildBeansDescriptorTargetPath(getBeansDescriptorTarget())); } if (webXmlDescriptor != null) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/descriptors/ClassActivator.java b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/descriptors/ClassActivator.java index 71a2350b14..1b20298342 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/descriptors/ClassActivator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/shrinkwrap/descriptors/ClassActivator.java @@ -44,7 +44,7 @@ public ClassActivator setAvailable(boolean isAvailable) { @Override public String getElementName() { - return isAvailable ? "if-class-available":"if-class-not-available"; + return isAvailable ? "if-class-available" : "if-class-not-available"; } @Override diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/False.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/False.java index bca0e53882..d18562bec0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/False.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/False.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java index 38689c791f..0dbf724fcf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierInheritedTest.java @@ -20,19 +20,19 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import java.lang.annotation.Inherited; + import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Inherited; - /** * * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java index 6b9b131358..9178371587 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotDeclaredTest.java @@ -21,11 +21,11 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java index 2e0bfa1d10..439f0ed3cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/QualifierNotInheritedTest.java @@ -20,19 +20,19 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import java.lang.annotation.Inherited; + import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Inherited; - /** * * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/True.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/True.java index fba2b4df50..bb2f8f2ff0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/True.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/resolution/qualifier/True.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/SelectedAlternative03Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/SelectedAlternative03Test.java index c60d28bf9d..3eaea898d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/SelectedAlternative03Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/SelectedAlternative03Test.java @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.UNSATISFIED_AND_AMBIG_DEPENDENCIES; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -37,7 +38,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(SelectedAlternative03Test.class) .withClasses(Delta.class, StandardDeltaProducer.class, AlternativeDeltaProducer1.class, - AlternativeDeltaProducer2.class).build(); + AlternativeDeltaProducer2.class) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Tame.java index 278cf80708..14cc4ceeba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Wild.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Wild.java index 5c10811936..cf81e8c5dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Wild.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/Wild.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByField.java index 2b9cdb3960..cf079f1970 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByField.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.alternative.selection.priority; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface ProducedByField { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByMethod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByMethod.java index 41e92e5a70..f306cacb86 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByMethod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducedByMethod.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.alternative.selection.priority; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface ProducedByMethod { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducerExplicitPriorityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducerExplicitPriorityTest.java index c7780e2ad2..253c53d3f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducerExplicitPriorityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/priority/ProducerExplicitPriorityTest.java @@ -18,6 +18,7 @@ import static org.testng.Assert.assertNotNull; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -71,10 +72,9 @@ public static WebArchive createTestArchive() { @ProducedByField Delta deltaFieldProducer; - @Test - @SpecAssertions({@SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_APPLICATION, id = "ca"), - @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_APPLICATION, id = "cb")}) + @SpecAssertions({ @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_APPLICATION, id = "ca"), + @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_APPLICATION, id = "cb") }) public void testAlternativeProducerWithPriority() { assertNotNull(alphaMethodProducer); assertNotNull(alphaFieldProducer); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/AlternativeStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/AlternativeStereotype.java index 14c826a117..bd08df48bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/AlternativeStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/AlternativeStereotype.java @@ -30,5 +30,5 @@ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface AlternativeStereotype { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StandardImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StandardImpl.java index ad59dd6bb6..63496dd92a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StandardImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StandardImpl.java @@ -20,11 +20,11 @@ * @author Matej Novotny */ @ApplicationScoped -public class StandardImpl implements SomeInterface{ +public class StandardImpl implements SomeInterface { @Override public String ping() { return StandardImpl.class.getSimpleName(); } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StereotypeWithAlternativeSelectedByPriorityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StereotypeWithAlternativeSelectedByPriorityTest.java index af3e46a40d..f4270d9e5a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StereotypeWithAlternativeSelectedByPriorityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/stereotype/priority/StereotypeWithAlternativeSelectedByPriorityTest.java @@ -13,8 +13,8 @@ */ package org.jboss.cdi.tck.tests.alternative.selection.stereotype.priority; -import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_APPLICATION_EE; import static org.jboss.cdi.tck.cdi.Sections.DECLARING_ALTERNATIVE; +import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_APPLICATION_EE; import static org.testng.Assert.assertEquals; import org.jboss.arquillian.container.test.api.Deployment; @@ -36,13 +36,13 @@ public class StereotypeWithAlternativeSelectedByPriorityTest extends AbstractTes @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(StereotypeWithAlternativeSelectedByPriorityTest.class) - .build(); + .build(); } @Test @SpecAssertions({ - @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_APPLICATION_EE, id = "ba"), - @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "ba") }) + @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_APPLICATION_EE, id = "ba"), + @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "ba") }) public void testStereotypeAlternativeIsEnabled() { assertEquals(getContextualReference(SomeInterface.class).ping(), AlternativeImpl.class.getSimpleName()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/AnimalStereotype.java index 318d8a6a4b..9d0ef8d349 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/AnimalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/BeanContainerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/BeanContainerTest.java index bceeac72f1..0876ad5428 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/BeanContainerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/BeanContainerTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,12 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; - + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; @@ -32,6 +37,7 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Singleton; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.literals.RetentionLiteral; @@ -42,11 +48,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - /** * Tests some of {@link jakarta.enterprise.inject.spi.BeanContainer} functionality. * diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl1.java index ab5b2331cb..4a0e35e79d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl1.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.beanContainer; +import java.lang.annotation.Annotation; + import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import java.lang.annotation.Annotation; - // dummy context, always active public class CustomContextImpl1 implements AlterableContext { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl2.java index acd23d88d7..a376c50ff0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomContextImpl2.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.beanContainer; +import java.lang.annotation.Annotation; + import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import java.lang.annotation.Annotation; - // dummy context, never active public class CustomContextImpl2 implements AlterableContext { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomScoped.java index e6cf9d1517..701fd5e1af 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/CustomScoped.java @@ -18,12 +18,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.NormalScope; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.context.NormalScope; + @NormalScope @Inherited @Target({ TYPE, METHOD, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Dog.java index 418274d8c5..a8a5c18462 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/DogHouse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/DogHouse.java index e76c23d30c..1c77e2353f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/DogHouse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/DogHouse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/NoImplScope.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/NoImplScope.java index eba3b251bc..fb9ac4e447 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/NoImplScope.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/NoImplScope.java @@ -18,12 +18,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.NormalScope; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.context.NormalScope; + // This scope has no context implementing it @NormalScope @Inherited diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Tame.java index 7251272df5..e4f9d29d99 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Terrier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Terrier.java index d714429765..0240898a75 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Terrier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Terrier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Transactional.java index 2a8add42c3..218954ec41 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/BeanEventAssignabilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/BeanEventAssignabilityTest.java index e1f91462db..762ece7fee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/BeanEventAssignabilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/BeanEventAssignabilityTest.java @@ -18,6 +18,11 @@ import java.util.List; import java.util.Set; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.literal.NamedLiteral; +import jakarta.enterprise.util.TypeLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -26,11 +31,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import jakarta.enterprise.inject.Any; -import jakarta.enterprise.inject.Default; -import jakarta.enterprise.inject.literal.NamedLiteral; -import jakarta.enterprise.util.TypeLiteral; - /** * @author Andrew Rouse */ @@ -51,13 +51,20 @@ public void testBeanMatching() { // Basic checks with qualifiers assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, Set.of()), "Bean did not match its own type"); - assertFalse(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, Set.of(Qualifier1.Literal.INSTANCE)), + assertFalse( + getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, + Set.of(Qualifier1.Literal.INSTANCE)), "Bean matched despite not having required qualifier"); - assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE), MyBean.class, Set.of(Qualifier1.Literal.INSTANCE)), + assertTrue( + getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE), MyBean.class, + Set.of(Qualifier1.Literal.INSTANCE)), "Bean did not match despite having required qualifier"); - assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE, Qualifier2.Literal.INSTANCE), MyBean.class, Set.of(Qualifier1.Literal.INSTANCE)), + assertTrue( + getCurrentBeanContainer().isMatchingBean(beanTypes, + Set.of(Qualifier1.Literal.INSTANCE, Qualifier2.Literal.INSTANCE), MyBean.class, + Set.of(Qualifier1.Literal.INSTANCE)), "Bean did not match despite having a superset of the required qualifiers"); - + // Only bean types passed in should be considered Set reducedBeanTypes = Set.of(MyBean.class); assertTrue(getCurrentBeanContainer().isMatchingBean(reducedBeanTypes, Set.of(), MyBean.class, Set.of()), @@ -66,11 +73,15 @@ public void testBeanMatching() { "Bean matched MyBeanInterface despite it not being in bean types"); assertTrue(getCurrentBeanContainer().isMatchingBean(reducedBeanTypes, Set.of(), Object.class, Set.of()), "Bean did not match when Object requested"); - + // Qualifier annotations on bean type classes should not be considered - assertTrue(getCurrentBeanContainer().isMatchingBean(Set.of(MyQualifiedBean.class), Set.of(), MyQualifiedBean.class, Set.of()), + assertTrue( + getCurrentBeanContainer().isMatchingBean(Set.of(MyQualifiedBean.class), Set.of(), MyQualifiedBean.class, + Set.of()), "MyQualifiedBean should match, qualifier on bean class should be ignored"); - assertFalse(getCurrentBeanContainer().isMatchingBean(Set.of(MyQualifiedBean.class), Set.of(), MyQualifiedBean.class, Set.of(Qualifier1.Literal.INSTANCE)), + assertFalse( + getCurrentBeanContainer().isMatchingBean(Set.of(MyQualifiedBean.class), Set.of(), MyQualifiedBean.class, + Set.of(Qualifier1.Literal.INSTANCE)), "MyQualifiedBean should not match, qualifier on bean class should be ignored"); } @@ -78,39 +89,49 @@ public void testBeanMatching() { @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "ab") public void testBeanMatchingDefaultQualifiers() { Set beanTypes = Set.of(MyBean.class, MyBeanInterface.class, Object.class); - - assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Default.Literal.INSTANCE), MyBean.class, Set.of()), + + assertTrue( + getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Default.Literal.INSTANCE), MyBean.class, Set.of()), "Bean with @Default should match when no qualifiers required"); - - assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, Set.of(Default.Literal.INSTANCE)), + + assertTrue( + getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, Set.of(Default.Literal.INSTANCE)), "Bean with no qualifiers should match when @Default required"); - + assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Any.Literal.INSTANCE), MyBean.class, Set.of()), "Bean with explicit @Any should match when no qualifiers required"); assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(NamedLiteral.of("foo")), MyBean.class, Set.of()), "Bean with @Named should match when no qualifiers required"); - - assertFalse(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE), MyBean.class, Set.of()), + + assertFalse( + getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE), MyBean.class, + Set.of()), "Bean with @Qualifier1 should not match when no qualifiers required (@Default implied required)"); - + assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, Set.of(Any.Literal.INSTANCE)), "Bean with no qualifiers should match when @Any required"); - - assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE), MyBean.class, Set.of(Any.Literal.INSTANCE)), + + assertTrue( + getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE), MyBean.class, + Set.of(Any.Literal.INSTANCE)), "Bean with @Qualifier1 should match when @Any required"); } @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "ac") public void testBeanMatchingNullException() { - + Set beanTypes = Set.of(MyBean.class, MyBeanInterface.class, Object.class); - - assertThrows("Null bean type", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingBean(null, Set.of(), MyBean.class, Set.of())); - assertThrows("Null bean qualifiers", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingBean(beanTypes, null, MyBean.class, Set.of())); - assertThrows("Null required type", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), null, Set.of())); - assertThrows("Null required qualifiers", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, null)); + + assertThrows("Null bean type", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingBean(null, Set.of(), MyBean.class, Set.of())); + assertThrows("Null bean qualifiers", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingBean(beanTypes, null, MyBean.class, Set.of())); + assertThrows("Null required type", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), null, Set.of())); + assertThrows("Null required qualifiers", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, null)); } @Test @@ -120,22 +141,25 @@ public void testBeanMatchingNonQualifiersException() { Set beanTypes = Set.of(MyBean.class, MyBeanInterface.class, Object.class); assertThrows("beanQualifiers annotation not a qualifier", IllegalArgumentException.class, - () -> getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE), MyBean.class, Set.of())); + () -> getCurrentBeanContainer().isMatchingBean(beanTypes, + Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE), MyBean.class, Set.of())); assertThrows("requiredQualifiers annotation not a qualifier", IllegalArgumentException.class, - () -> getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE))); + () -> getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, + Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE))); } - + @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "ae") public void testNonLegalBeanTypesIgnored() { // A parameterized type that contains a wildcard type parameter is not a legal bean type. - TypeLiteral> listOfWildcard = new TypeLiteral<>() {}; + TypeLiteral> listOfWildcard = new TypeLiteral<>() { + }; Set beanTypes = Set.of(MyBean.class, MyBeanInterface.class, listOfWildcard.getType(), Object.class); - + assertTrue(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), MyBean.class, Set.of()), "Non-legal bean type should be ignored, allowing match"); - + assertFalse(getCurrentBeanContainer().isMatchingBean(beanTypes, Set.of(), listOfWildcard.getType(), Set.of()), "Non-legal bean type should be ignored, preventing match"); } @@ -146,99 +170,135 @@ public void testEventMatching() { assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, Set.of()), "Event did not match its own type"); - assertFalse(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE)), + assertFalse( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, + Set.of(Qualifier1.Literal.INSTANCE)), "Event matched despite not having required qualifier"); - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE)), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, + Set.of(Qualifier1.Literal.INSTANCE)), "Event did not match despite having required qualifier"); - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE, Qualifier2.Literal.INSTANCE), MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE)), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, + Set.of(Qualifier1.Literal.INSTANCE, Qualifier2.Literal.INSTANCE), MyEvent.class, + Set.of(Qualifier1.Literal.INSTANCE)), "Event did not match despite having a superset of the required qualifiers"); assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEventInterface.class, Set.of()), "Event should match when a supertype is required"); - + assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), Object.class, Set.of()), "Event should match when Object is required"); - - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Default.Literal.INSTANCE), MyEvent.class, Set.of()), + + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Default.Literal.INSTANCE), MyEvent.class, + Set.of()), "Event with @Default should match when no qualifiers required"); - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Any.Literal.INSTANCE), MyEvent.class, Set.of()), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Any.Literal.INSTANCE), MyEvent.class, Set.of()), "Event with explicit @Any should match when no qualifiers required"); - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, Set.of()), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, + Set.of()), "Event with @Qualifier1 should match when no qualifiers required"); - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(NamedLiteral.of("foo")), MyEvent.class, Set.of()), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(NamedLiteral.of("foo")), MyEvent.class, + Set.of()), "Event with @Named should match when no qualifiers required"); } - + @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "bf") public void testEventMatchingDefaultQualifier() { - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, Set.of(Default.Literal.INSTANCE)), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, + Set.of(Default.Literal.INSTANCE)), "Event with no qualifiers should match when @Default required"); - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Default.Literal.INSTANCE), MyEvent.class, Set.of(Default.Literal.INSTANCE)), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Default.Literal.INSTANCE), MyEvent.class, + Set.of(Default.Literal.INSTANCE)), "Event with @Default should match when @Default required"); - assertFalse(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, Set.of(Default.Literal.INSTANCE)), + assertFalse( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, + Set.of(Default.Literal.INSTANCE)), "Event with @Qualifier1 should not match when @Default required"); } @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "ba") public void testEventMatchingParameterized() { - TypeLiteral> listOfString = new TypeLiteral<>() {}; - TypeLiteral> listOfWildcard = new TypeLiteral<>() {}; - TypeLiteral> listOfInteger = new TypeLiteral<>() {}; - - assertTrue(getCurrentBeanContainer().isMatchingEvent(listOfString.getType(), Set.of(), listOfString.getType(), Set.of()), + TypeLiteral> listOfString = new TypeLiteral<>() { + }; + TypeLiteral> listOfWildcard = new TypeLiteral<>() { + }; + TypeLiteral> listOfInteger = new TypeLiteral<>() { + }; + + assertTrue( + getCurrentBeanContainer().isMatchingEvent(listOfString.getType(), Set.of(), listOfString.getType(), Set.of()), "Event with Parameterized type should match when same Parameterized type is requested"); - assertTrue(getCurrentBeanContainer().isMatchingEvent(listOfString.getType(), Set.of(), listOfWildcard.getType(), Set.of()), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(listOfString.getType(), Set.of(), listOfWildcard.getType(), Set.of()), "Event with Parameterized type should match when Parameterized type with wildcard is requested"); - assertFalse(getCurrentBeanContainer().isMatchingEvent(listOfString.getType(), Set.of(), listOfInteger.getType(), Set.of()), + assertFalse( + getCurrentBeanContainer().isMatchingEvent(listOfString.getType(), Set.of(), listOfInteger.getType(), Set.of()), "Event with Parameterized type should not match when a different Parameterized type is requested"); } @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "bb") public void testEventMatchingAnyQualifier() { - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, Set.of(Any.Literal.INSTANCE)), + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, Set.of(Any.Literal.INSTANCE)), "Event with no qualifiers should match when @Any required"); - - assertTrue(getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, Set.of(Any.Literal.INSTANCE)), + + assertTrue( + getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE), MyEvent.class, + Set.of(Any.Literal.INSTANCE)), "Event with @Qualifier1 should match when @Any required"); } @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "bc") public void testEventMatchingNullException() { - assertThrows("Null event type", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingEvent(null, Set.of(), MyBean.class, Set.of())); - assertThrows("Null event qualifiers", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, null, MyEvent.class, Set.of())); - assertThrows("Null required type", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), null, Set.of())); - assertThrows("Null required qualifiers", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, null)); + assertThrows("Null event type", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingEvent(null, Set.of(), MyBean.class, Set.of())); + assertThrows("Null event qualifiers", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, null, MyEvent.class, Set.of())); + assertThrows("Null required type", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), null, Set.of())); + assertThrows("Null required qualifiers", IllegalArgumentException.class, + () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, null)); } @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "bd") public void testEventMatchingTypeVarException() { - TypeLiteral> varEventType = new TypeLiteral<>() {}; + TypeLiteral> varEventType = new TypeLiteral<>() { + }; assertThrows("Type variable in event type", IllegalArgumentException.class, () -> getCurrentBeanContainer().isMatchingEvent(varEventType.getType(), Set.of(), MyBean.class, Set.of())); } - + @Test @SpecAssertion(section = BM_BEAN_EVENT_ASSIGNABILITY, id = "be") public void testEventMatchingNonQualifiersException() { assertThrows("A specifiedQualifiers annotation not a qualifier", IllegalArgumentException.class, - () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE), MyEvent.class, Set.of())); + () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, + Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE), MyEvent.class, Set.of())); assertThrows("An observedEventQualfiers annotation not a qualifier", IllegalArgumentException.class, - () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE))); + () -> getCurrentBeanContainer().isMatchingEvent(MyEvent.class, Set.of(), MyEvent.class, + Set.of(Qualifier1.Literal.INSTANCE, NonQualifier.Literal.INSTANCE))); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier1.java index 744877eb7d..7c6c5672a2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier1.java @@ -25,7 +25,7 @@ @Retention(RUNTIME) @Target({ TYPE, METHOD, FIELD, PARAMETER }) public @interface Qualifier1 { - + static class Literal extends AnnotationLiteral implements Qualifier1 { static final Qualifier1 INSTANCE = new Literal(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier2.java index 0276677671..043cec8a90 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/assignability/Qualifier2.java @@ -25,7 +25,7 @@ @Retention(RUNTIME) @Target({ TYPE, METHOD, FIELD, PARAMETER }) public @interface Qualifier2 { - + static class Literal extends AnnotationLiteral implements Qualifier2 { static final Qualifier2 INSTANCE = new Literal(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/BeanByTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/BeanByTypeTest.java index d1999dbab2..704899fa05 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/BeanByTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/BeanByTypeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,11 +19,13 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.TypeLiteral; import java.lang.reflect.TypeVariable; import java.util.Set; + import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.util.TypeLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -50,7 +52,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_BEAN_BY_TYPE, id = "aa"), @SpecAssertion(section = BM_OBTAIN_BEAN_BY_TYPE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_BEAN_BY_TYPE, id = "aa"), + @SpecAssertion(section = BM_OBTAIN_BEAN_BY_TYPE, id = "b") }) public void testGetBeans() { Set> beans = getCurrentBeanContainer().getBeans(SimpleBean.class); assertEquals(beans.size(), 1); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/DerivedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/DerivedBean.java index 902c0edd9e..f68128940f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/DerivedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/DerivedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingType.java index e7083143c5..0a635bed13 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingTypeLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingTypeLiteral.java index 59d2d45125..8ce3fce178 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingTypeLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/NonBindingTypeLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/SimpleBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/SimpleBean.java index e4d0dc971c..3b4ad10549 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/SimpleBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/SimpleBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/Tame.java index 9cbc4902e2..cffd8a0d8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/TameLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/TameLiteral.java index 983f4d3581..e6b334834c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/TameLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/bytype/TameLiteral.java @@ -1,30 +1,30 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.beanContainer.bytype; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class TameLiteral extends AnnotationLiteral implements Tame { - - private String value; - - public TameLiteral(String value){ - this.value=value; - } - - @Override - public String value() { - return value; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.beanContainer.bytype; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class TameLiteral extends AnnotationLiteral implements Tame { + + private String value; + + public TameLiteral(String value) { + this.value = value; + } + + @Override + public String value() { + return value; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/injection/BeanContainerInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/injection/BeanContainerInjectionTest.java index bf5fe0fd80..c09e2b4128 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/injection/BeanContainerInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/beanContainer/injection/BeanContainerInjectionTest.java @@ -21,6 +21,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.spi.BeanContainer; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/ChangeBeanQualifierTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/ChangeBeanQualifierTest.java index 08ce576d09..125f11c9a6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/ChangeBeanQualifierTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/ChangeBeanQualifierTest.java @@ -13,6 +13,8 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.changeBeanQualifier; +import static org.testng.Assert.assertTrue; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -22,8 +24,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "cdi", version = "4.0") public class ChangeBeanQualifierTest extends AbstractTest { @Deployment @@ -35,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "b", note="Extension changes of MyQualifier are seen") + @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "b", note = "Extension changes of MyQualifier are seen") public void test() { MyOtherService bean = getContextualReference(MyOtherService.class); // all beans are dependent, so there's no client proxy and direct field access and `instanceof` are OK diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/MyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/MyQualifier.java index 7721f46583..9454608267 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/MyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeBeanQualifier/MyQualifier.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.changeBeanQualifier; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface MyQualifier { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/ChangeInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/ChangeInjectionPointTest.java index 9a6a540cf8..b74553b110 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/ChangeInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/ChangeInjectionPointTest.java @@ -13,6 +13,8 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.changeInjectionPoint; +import static org.testng.Assert.assertTrue; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -22,8 +24,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "cdi", version = "4.0") public class ChangeInjectionPointTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/MyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/MyQualifier.java index 5b9757129a..fb4843105d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/MyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInjectionPoint/MyQualifier.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.changeInjectionPoint; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface MyQualifier { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/ChangeInterceptorBindingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/ChangeInterceptorBindingTest.java index 866ee42d11..f99d5d8577 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/ChangeInterceptorBindingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/ChangeInterceptorBindingTest.java @@ -26,11 +26,12 @@ import org.testng.annotations.Test; /** - * Test interceptor bindings applied to methods via extension are used to bind the correct interceptor and returned from InvocationContext.getInterceptorBindings() + * Test interceptor bindings applied to methods via extension are used to bind the correct interceptor and returned from + * InvocationContext.getInterceptorBindings() */ @SpecVersion(spec = "cdi", version = "4.1") public class ChangeInterceptorBindingTest extends AbstractTest { - + @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder() @@ -38,10 +39,10 @@ public static WebArchive createTestArchive() { .withBuildCompatibleExtension(ChangeInterceptorBindingExtension.class) .build(); } - + @Test @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "b") - @SpecAssertion(section = InterceptorsSections.INVOCATIONCONTEXT, id="o") + @SpecAssertion(section = InterceptorsSections.INVOCATIONCONTEXT, id = "o") public void test() { assertEquals(getContextualReference(MyService.class).hello(), "Intercepted(foo): Hello!"); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/MyBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/MyBinding.java index 55bbeb03ca..a41470dbcf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/MyBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeInterceptorBinding/MyBinding.java @@ -33,7 +33,7 @@ @Nonbinding public String value(); - + public class Literal extends AnnotationLiteral implements MyBinding { private String value; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/ChangeObserverQualifierTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/ChangeObserverQualifierTest.java index 8d25792eb7..54f9ba307e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/ChangeObserverQualifierTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/ChangeObserverQualifierTest.java @@ -13,8 +13,13 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.changeObserverQualifier; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -24,11 +29,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "cdi", version = "4.0") public class ChangeObserverQualifierTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyConsumer.java index 7ffa0979dc..f97b1b595b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyConsumer.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.changeObserverQualifier; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.event.Observes; - import java.util.HashSet; import java.util.Set; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; + @ApplicationScoped public class MyConsumer { static final Set events = new HashSet<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyQualifier.java index affac66394..e3436d416e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/changeObserverQualifier/MyQualifier.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.changeObserverQualifier; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface MyQualifier { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingExtension.java index 1ceb24f622..4891caf330 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingExtension.java @@ -20,7 +20,6 @@ import jakarta.enterprise.inject.build.compatible.spi.Discovery; import jakarta.enterprise.inject.build.compatible.spi.Enhancement; import jakarta.enterprise.inject.build.compatible.spi.MetaAnnotations; -import jakarta.enterprise.inject.build.compatible.spi.ScannedClasses; import jakarta.enterprise.util.Nonbinding; public class CustomInterceptorBindingExtension implements BuildCompatibleExtension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingTest.java index 8b55352fae..6fadb33217 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customInterceptorBinding/CustomInterceptorBindingTest.java @@ -13,6 +13,8 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customInterceptorBinding; +import static org.testng.Assert.assertEquals; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -22,8 +24,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.0") public class CustomInterceptorBindingTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContext.java index b37134cf6c..3129ff572a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContext.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customNormalScope; +import java.lang.annotation.Annotation; +import java.util.HashMap; +import java.util.Map; + import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import java.lang.annotation.Annotation; -import java.util.HashMap; -import java.util.Map; - public class CommandContext implements AlterableContext { private final ThreadLocal, ContextualInstance>> currentContext = new ThreadLocal<>(); private final ThreadLocal currentCommandExecution = new ThreadLocal<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContextController.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContextController.java index 85863d2eb6..b60493ff6c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContextController.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandContextController.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customNormalScope; +import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.inject.spi.BeanContainer; -import java.util.concurrent.atomic.AtomicBoolean; - /** * Allows manual activation and deactivation of the {@linkplain CommandScoped command} context. * The {@code activate()} method returns {@code true} if the command context was not diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandScoped.java index 36af9d8244..52528880ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CommandScoped.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customNormalScope; -import jakarta.enterprise.context.NormalScope; - import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.context.NormalScope; + /** * Specifies that a bean belongs to the command normal scope. *

      @@ -35,7 +35,7 @@ * certain details about the command execution and allows exchanging data between beans in the same command scope. */ @NormalScope -@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) +@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) @Inherited public @interface CommandScoped { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CustomNormalScopeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CustomNormalScopeTest.java index ddc90e8738..3b403b4e3f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CustomNormalScopeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customNormalScope/CustomNormalScopeTest.java @@ -13,6 +13,10 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customNormalScope; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -21,10 +25,6 @@ import org.jboss.test.audit.annotations.SpecAssertion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - // this test is basically a stripped down version of https://github.com/weld/command-context-example public class CustomNormalScopeTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/CustomPseudoScopeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/CustomPseudoScopeTest.java index 9e3b53e1d4..dc282d9efc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/CustomPseudoScopeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/CustomPseudoScopeTest.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customPseudoScope; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -22,9 +25,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotEquals; - @SpecVersion(spec = "cdi", version = "4.0") public class CustomPseudoScopeTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/Prototype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/Prototype.java index 5eb8bd70c1..6d5537ff8f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/Prototype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/Prototype.java @@ -13,17 +13,17 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customPseudoScope; -import jakarta.enterprise.context.spi.Context; -import jakarta.enterprise.context.spi.Contextual; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.inject.Scope; - import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.context.spi.Context; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.inject.Scope; + /** * Specifies that a bean belongs to the prototype pseudo-scope. *

      @@ -42,7 +42,7 @@ * The {@code @Prototype} scope is always active. */ @Scope -@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) +@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) @Inherited public @interface Prototype { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeContext.java index 3089e67729..02d9a46f8f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeContext.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customPseudoScope; +import java.lang.annotation.Annotation; + import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import java.lang.annotation.Annotation; - public class PrototypeContext implements AlterableContext { public Class getScope() { return Prototype.class; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeScoped.java index c71883eff9..5635bb2eea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customPseudoScope/PrototypeScoped.java @@ -13,13 +13,13 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customPseudoScope; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.inject.Stereotype; + @Prototype @Stereotype @Target(ElementType.TYPE) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/CustomQualifierTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/CustomQualifierTest.java index 468c708097..8da38c2898 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/CustomQualifierTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/CustomQualifierTest.java @@ -13,6 +13,8 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customQualifier; +import static org.testng.Assert.assertEquals; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -22,8 +24,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.0") public class CustomQualifierTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/MyCustomQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/MyCustomQualifier.java index b62b3eeeab..3a21983473 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/MyCustomQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customQualifier/MyCustomQualifier.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customQualifier; -import jakarta.enterprise.util.AnnotationLiteral; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.enterprise.util.AnnotationLiteral; + @Retention(RetentionPolicy.RUNTIME) public @interface MyCustomQualifier { String value(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customStereotype/CustomStereotypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customStereotype/CustomStereotypeTest.java index 4031a520d2..6d78bf412e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customStereotype/CustomStereotypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/customStereotype/CustomStereotypeTest.java @@ -13,7 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.customStereotype; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import jakarta.enterprise.context.ApplicationScoped; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -23,9 +27,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "cdi", version = "4.0") public class CustomStereotypeTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/inspectAnnotatedSubtypes/InspectAnnotatedSubtypesExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/inspectAnnotatedSubtypes/InspectAnnotatedSubtypesExtension.java index 3876cc53b6..e9adb5cc52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/inspectAnnotatedSubtypes/InspectAnnotatedSubtypesExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/inspectAnnotatedSubtypes/InspectAnnotatedSubtypesExtension.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.inspectAnnotatedSubtypes; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.ClassConfig; import jakarta.enterprise.inject.build.compatible.spi.Discovery; @@ -21,9 +24,6 @@ import jakarta.enterprise.inject.build.compatible.spi.ScannedClasses; import jakarta.enterprise.inject.build.compatible.spi.Validation; -import java.util.HashSet; -import java.util.Set; - public class InspectAnnotatedSubtypesExtension implements BuildCompatibleExtension { private final Set seenAnnotatedSubtypes = new HashSet<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/AbstractInvalidExtensionParamTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/AbstractInvalidExtensionParamTest.java index 2ea60b6021..34179bc1a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/AbstractInvalidExtensionParamTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/AbstractInvalidExtensionParamTest.java @@ -31,5 +31,4 @@ static WebArchiveBuilder prepareArchiveBuilder() { .withBeansXml(new BeansXml()); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParams2Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParams2Test.java index 6ecfbcf007..84e3ad0ca3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParams2Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParams2Test.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "ab", note = "Fail due to more than one parameter ext method") + @SpecAssertion(section = Sections.REGISTRATION_PHASE, id = "ab", note = "Fail due to more than one parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParamsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParamsTest.java index 3a633ccb40..d657c00f8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParamsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementMultipleParamsTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,6 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "ab", note = "Fail due to more than one parameter ext method") + @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "ab", note = "Fail due to more than one parameter ext method") public void shouldFail() { - }} + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamExtension.java index 8adc370f9e..0ea82b4b8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamExtension.java @@ -15,6 +15,7 @@ import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.Enhancement; + import org.jboss.test.audit.annotations.SpecVersion; @SpecVersion(spec = "cdi", version = "4.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamTest.java index 44671451ca..69a389846c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementNoParamTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "aa", note = "Fail due to no parameter ext method") + @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "aa", note = "Fail due to no parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyMessagesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyMessagesTest.java index ffbf94028d..e498b5c7ae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyMessagesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyMessagesTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "aa", note = "Fail due to no required parameter ext method") + @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "aa", note = "Fail due to no required parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyTypesTest.java index 5a0aed0399..bb68eb56a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/EnhancementOnlyTypesTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id= "aa", note = "Fail due to no required parameter ext method") + @SpecAssertion(section = Sections.ENHANCEMENT_PHASE, id = "aa", note = "Fail due to no required parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParams2Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParams2Test.java index e60a0b3ac3..3e3d355c7b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParams2Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParams2Test.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "ab", note = "Fail due to more than one parameter ext method") + @SpecAssertion(section = Sections.REGISTRATION_PHASE, id = "ab", note = "Fail due to more than one parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension.java index 5b33ffb416..43a7876ab1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension.java @@ -20,7 +20,7 @@ public class RegistrationMultipleParamsExtension implements BuildCompatibleExtension { - @Registration(types = {SomeBean.class}) + @Registration(types = { SomeBean.class }) public void register(BeanInfo bi, InterceptorInfo ii) { // no-op, deployment should fail } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension2.java index 85a2b5b523..d216e70fc0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsExtension2.java @@ -21,7 +21,7 @@ public class RegistrationMultipleParamsExtension2 implements BuildCompatibleExtension { - @Registration(types = {SomeBean.class}) + @Registration(types = { SomeBean.class }) public void register(ObserverInfo oi, Types t, BeanInfo bi) { // no-op, deployment should fail } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsTest.java index 8bdb56a50f..b337a28e27 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationMultipleParamsTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "ab", note = "Fail due to more than one parameter ext method") + @SpecAssertion(section = Sections.REGISTRATION_PHASE, id = "ab", note = "Fail due to more than one parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamExtension.java index fd7b747ca3..0cba92c285 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamExtension.java @@ -18,7 +18,7 @@ public class RegistrationNoParamExtension implements BuildCompatibleExtension { - @Registration(types = {SomeBean.class}) + @Registration(types = { SomeBean.class }) public void register() { // no-op, deployment should fail } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamTest.java index 0442f48024..a9f8d755f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationNoParamTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "aa", note = "Fail due to no parameter ext method") + @SpecAssertion(section = Sections.REGISTRATION_PHASE, id = "aa", note = "Fail due to no parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesExtension.java index 97d1727c44..4057e62704 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesExtension.java @@ -19,7 +19,7 @@ public class RegistrationOnlyMessagesExtension implements BuildCompatibleExtension { - @Registration(types = {SomeBean.class}) + @Registration(types = { SomeBean.class }) public void register(Messages m) { // no-op, deployment should fail } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesTest.java index 5e0b250d3c..145cb6e6a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyMessagesTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "aa", note = "Fail due to no required parameter ext method") + @SpecAssertion(section = Sections.REGISTRATION_PHASE, id = "aa", note = "Fail due to no required parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesExtension.java index c2158fdcfa..4b889dde31 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesExtension.java @@ -19,7 +19,7 @@ public class RegistrationOnlyTypesExtension implements BuildCompatibleExtension { - @Registration(types = {SomeBean.class}) + @Registration(types = { SomeBean.class }) public void register(Types t) { // no-op, deployment should fail } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesTest.java index c5722d88cf..299046b7c9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/invalid/RegistrationOnlyTypesTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.invalid; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.cdi.Sections; @@ -34,7 +35,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertion(section = Sections.REGISTRATION_PHASE, id= "aa", note = "Fail due to no required parameter ext method") + @SpecAssertion(section = Sections.REGISTRATION_PHASE, id = "aa", note = "Fail due to no required parameter ext method") public void shouldFail() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/priority/PriorityExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/priority/PriorityExtension.java index fada55dbd0..6799ac7fd3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/priority/PriorityExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/priority/PriorityExtension.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.priority; +import java.util.LinkedHashSet; +import java.util.List; + import jakarta.annotation.Priority; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,9 +26,6 @@ import jakarta.enterprise.inject.build.compatible.spi.Registration; import jakarta.enterprise.inject.build.compatible.spi.Validation; -import java.util.LinkedHashSet; -import java.util.List; - public class PriorityExtension implements BuildCompatibleExtension { private final LinkedHashSet invocations = new LinkedHashSet<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyInterceptorBinding.java index 0bdaf7fc19..3a09a630c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyInterceptorBinding.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.registration; -import jakarta.interceptor.InterceptorBinding; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@Target({ElementType.TYPE, ElementType.METHOD}) +import jakarta.interceptor.InterceptorBinding; + +@Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @InterceptorBinding public @interface MyInterceptorBinding { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyQualifier.java index 0b22c6d152..cb2638303d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/MyQualifier.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.registration; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface MyQualifier { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/RegistrationExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/RegistrationExtension.java index 7d81193c9f..8a30fead4c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/RegistrationExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/registration/RegistrationExtension.java @@ -13,6 +13,8 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.registration; +import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.Messages; @@ -21,8 +23,6 @@ import jakarta.enterprise.inject.build.compatible.spi.Types; import jakarta.enterprise.inject.build.compatible.spi.Validation; -import java.util.concurrent.atomic.AtomicInteger; - public class RegistrationExtension implements BuildCompatibleExtension { private final AtomicInteger beanCounter = new AtomicInteger(); private final AtomicInteger beanMyQualifierCounter = new AtomicInteger(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyPojoDisposer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyPojoDisposer.java index e6771972ad..f1b00dd855 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyPojoDisposer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyPojoDisposer.java @@ -13,13 +13,13 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.build.compatible.spi.Parameters; import jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanDisposer; -import java.util.HashSet; -import java.util.Set; - public class MyPojoDisposer implements SyntheticBeanDisposer { static final Set disposed = new HashSet<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyQualifier.java index bbf2affa32..3f1917a7b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MyQualifier.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface MyQualifier { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MySimpleValue.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MySimpleValue.java index 1295495dad..7c7ec90c07 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MySimpleValue.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/MySimpleValue.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean; -import jakarta.enterprise.util.AnnotationLiteral; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.enterprise.util.AnnotationLiteral; + @Retention(RetentionPolicy.RUNTIME) public @interface MySimpleValue { String value(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanExtension.java index d068ac87a3..3baf895386 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanExtension.java @@ -41,11 +41,12 @@ public void synthesize(SyntheticComponents syn, Types types) { .withParam("data", AnnotationBuilder.of(MyComplexValue.class) .member("number", 13) .member("enumeration", MyEnum.class, "NO") - .member("type", types.ofClass("org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean.MyEnum") - .declaration()) + .member("type", + types.ofClass("org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean.MyEnum") + .declaration()) .member("nested", AnnotationBuilder.of( - types.ofClass("org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean.MySimpleValue") - .declaration()) + types.ofClass("org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean.MySimpleValue") + .declaration()) .value("no").build()) .build()) .createWith(MyPojoCreator.class) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanTest.java index 77e72a5dba..f231e7277d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBean/SyntheticBeanTest.java @@ -13,7 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBean; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -23,10 +28,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "cdi", version = "4.0") public class SyntheticBeanTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanInjectionPoint/SyntheticBeanInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanInjectionPoint/SyntheticBeanInjectionPointTest.java index ffa7c405f3..ac47c9caea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanInjectionPoint/SyntheticBeanInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanInjectionPoint/SyntheticBeanInjectionPointTest.java @@ -13,7 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBeanInjectionPoint; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.fail; + import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -23,10 +28,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.fail; - @SpecVersion(spec = "cdi", version = "4.0") public class SyntheticBeanInjectionPointTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyDependentBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyDependentBean.java index 7cb40b0014..cf3bb5e2e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyDependentBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyDependentBean.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBeanWithLookup; +import java.util.concurrent.atomic.AtomicInteger; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; -import java.util.concurrent.atomic.AtomicInteger; - @Dependent public class MyDependentBean { static final AtomicInteger createdCounter = new AtomicInteger(0); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoCreator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoCreator.java index 6a63287b8b..9977c44570 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoCreator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoCreator.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBeanWithLookup; +import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.build.compatible.spi.Parameters; import jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanCreator; -import java.util.concurrent.atomic.AtomicInteger; - public class MyPojoCreator implements SyntheticBeanCreator { static final AtomicInteger counter = new AtomicInteger(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoDisposer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoDisposer.java index c98b07966a..9e445a98a2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoDisposer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/MyPojoDisposer.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBeanWithLookup; +import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.build.compatible.spi.Parameters; import jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanDisposer; -import java.util.concurrent.atomic.AtomicInteger; - public class MyPojoDisposer implements SyntheticBeanDisposer { static final AtomicInteger counter = new AtomicInteger(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/SyntheticBeanWithLookupTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/SyntheticBeanWithLookupTest.java index 76dd645d9a..dae0743726 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/SyntheticBeanWithLookupTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticBeanWithLookup/SyntheticBeanWithLookupTest.java @@ -13,7 +13,10 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticBeanWithLookup; +import static org.testng.Assert.assertEquals; + import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -23,8 +26,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.0") public class SyntheticBeanWithLookupTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyObserver.java index 41e0f1846d..9873ae8f26 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyObserver.java @@ -13,13 +13,13 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticObserver; +import java.util.ArrayList; +import java.util.List; + import jakarta.enterprise.inject.build.compatible.spi.Parameters; import jakarta.enterprise.inject.build.compatible.spi.SyntheticObserver; import jakarta.enterprise.inject.spi.EventContext; -import java.util.ArrayList; -import java.util.List; - public class MyObserver implements SyntheticObserver { static final List observed = new ArrayList<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyQualifier.java index 5d787dff6e..550a97ee10 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/MyQualifier.java @@ -13,11 +13,11 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticObserver; -import jakarta.inject.Qualifier; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.inject.Qualifier; + @Qualifier @Retention(RetentionPolicy.RUNTIME) public @interface MyQualifier { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/SyntheticObserverTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/SyntheticObserverTest.java index 3a03511415..03d7bda2a2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/SyntheticObserverTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserver/SyntheticObserverTest.java @@ -13,6 +13,10 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticObserver; +import static org.testng.Assert.assertEquals; + +import java.util.List; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -20,13 +24,8 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.testng.Assert; import org.testng.annotations.Test; -import java.util.List; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.0") public class SyntheticObserverTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyObserver.java index af939c15e8..e6b76c81e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyObserver.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticObserverOfParameterizedType; -import jakarta.enterprise.inject.build.compatible.spi.Parameters; -import jakarta.enterprise.inject.build.compatible.spi.SyntheticObserver; -import jakarta.enterprise.inject.spi.EventContext; - import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import jakarta.enterprise.inject.build.compatible.spi.Parameters; +import jakarta.enterprise.inject.build.compatible.spi.SyntheticObserver; +import jakarta.enterprise.inject.spi.EventContext; + public class MyObserver implements SyntheticObserver> { static final List observed = new ArrayList<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyService.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyService.java index 5aba0b9e3a..158ff2c1a4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyService.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/MyService.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticObserverOfParameterizedType; +import java.util.List; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Event; import jakarta.inject.Inject; -import java.util.List; - @ApplicationScoped public class MyService { @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeExtension.java index 7e238774b5..6fb4d3399e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeExtension.java @@ -13,17 +13,17 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticObserverOfParameterizedType; +import java.util.List; + import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.inject.build.compatible.spi.Types; -import java.util.List; - public class SyntheticObserverOfParameterizedTypeExtension implements BuildCompatibleExtension { @Synthesis public void synthesize(SyntheticComponents syn, Types types) { - syn.>addObserver(types.parameterized(List.class, MyData.class)) + syn.> addObserver(types.parameterized(List.class, MyData.class)) .observeWith(MyObserver.class); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeTest.java index 6c345112d8..d925b2569d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/syntheticObserverOfParameterizedType/SyntheticObserverOfParameterizedTypeTest.java @@ -13,6 +13,10 @@ */ package org.jboss.cdi.tck.tests.build.compatible.extensions.syntheticObserverOfParameterizedType; +import static org.testng.Assert.assertEquals; + +import java.util.List; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -22,10 +26,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.0") public class SyntheticObserverOfParameterizedTypeTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/validation/ValidationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/validation/ValidationTest.java index 47763b825b..e2b88abbc8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/validation/ValidationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/build/compatible/extensions/validation/ValidationTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.build.compatible.extensions.validation; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/AnotherRequestBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/AnotherRequestBean.java index cd9842a6c4..7e6b77798c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/AnotherRequestBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/AnotherRequestBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContext2Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContext2Test.java index 3db41d7949..a21fe5fd02 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContext2Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContext2Test.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author Pete Muir * @author David Allen diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContextTest.java index b97b81ca54..683f1b39fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyForSameCreationalContextTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author Pete Muir * @author David Allen diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyedInstanceReturnedByGetTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyedInstanceReturnedByGetTest.java index b4a2d13479..9a8c26d664 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyedInstanceReturnedByGetTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/DestroyedInstanceReturnedByGetTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,6 @@ import static org.jboss.cdi.tck.cdi.Sections.CONTEXT; import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetFromContextualTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetFromContextualTest.java index 8202bd6be5..201e67349f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetFromContextualTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetFromContextualTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -49,7 +49,8 @@ public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven() { CreationalContext myCreationalContext = getCurrentManager().createCreationalContext(myRequestBean); assert getCurrentManager().getContext(RequestScoped.class).get(myRequestBean, myCreationalContext) != null; - CreationalContext myOtherCreationalContext = getCurrentManager().createCreationalContext(myApplicationBean); + CreationalContext myOtherCreationalContext = getCurrentManager() + .createCreationalContext(myApplicationBean); assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myOtherCreationalContext) != null; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetOnInactiveContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetOnInactiveContextTest.java index 7c5691d7d4..2b7b119d12 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetOnInactiveContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetOnInactiveContextTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,6 @@ import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.Contextual; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetWithNoCreationalContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetWithNoCreationalContextTest.java index ac34895549..ba43f2e3da 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetWithNoCreationalContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/GetWithNoCreationalContextTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,6 @@ import static org.jboss.cdi.tck.cdi.Sections.CONTEXT; import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Contextual; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyApplicationBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyApplicationBean.java index d976cdb86c..8ced5f0e7e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyApplicationBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyApplicationBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,7 +21,7 @@ public class MyApplicationBean implements Serializable { /** - * + * */ private static final long serialVersionUID = 1L; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyRequestBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyRequestBean.java index 5ce2e90656..d189fe6b5c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyRequestBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/MyRequestBean.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.tests.context; -import jakarta.enterprise.context.RequestScoped; - import java.io.Serializable; +import jakarta.enterprise.context.RequestScoped; + @RequestScoped public class MyRequestBean implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/alterable/AlterableContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/alterable/AlterableContextTest.java index a40a257187..919062e3ea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/alterable/AlterableContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/alterable/AlterableContextTest.java @@ -31,11 +31,11 @@ /** * Tests for https://issues.jboss.org/browse/CDI-139 - * + * *

      * This test was originally part of the Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/AccountTransaction.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/AccountTransaction.java index e069a68d5e..b09c71ce52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/AccountTransaction.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/AccountTransaction.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Animal.java index be7036fc03..87bb44f924 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.dependent; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.dependent; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ApplicationHorseStable.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ApplicationHorseStable.java index eac878b75b..eba425d36b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ApplicationHorseStable.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ApplicationHorseStable.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlyAnimal.java index f00a0ea431..c559be6779 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.dependent; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.dependent; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlySpider.java index ffa0e13a0d..a71312f3c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.dependent; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.dependent; + +public interface DeadlySpider extends DeadlyAnimal { + +} 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 45575ec360..4bebc21a3e 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,7 +34,6 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -86,7 +85,6 @@ public void testDependentBeanIsDependentObjectOfBeanInjectedInto() { assert !foxHole.fox.equals(foxHole.initializerFox); } - @Test @SpecAssertion(section = DEPENDENT_CONTEXT, id = "da") public void testInstanceUsedForProducerMethodNotShared() throws Exception { @@ -330,8 +328,6 @@ public void testDestroyingManagedParentDestroysDependentsOfSameBean() { assert Fox.getDestroyCount() == 2; } - - @Test @SpecAssertion(section = DEPENDENT_DESTRUCTION, id = "ddd") @SpecAssertion(section = DEPENDENT_OBJECTS, id = "h") @@ -404,7 +400,6 @@ public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes() { assert Fox.isDestroyed(); } - @Test @SpecAssertion(section = DEPENDENT_OBJECTS, id = "aa") public void testDependentScopedInterceptorsAreDependentObjectsOfBean() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Farm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Farm.java index 4cdf3cae07..0c07bbeef8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Farm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Fox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Fox.java index 888c065128..b4f7954b43 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Fox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Fox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxFarm.java index 0cfe0a1365..48a036499f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxFarm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxHole.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxHole.java index 0f3313c1ea..0e9eda2ff6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxHole.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxHole.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxProducer.java index 318b964cba..b842e2761b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxRun.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxRun.java index d665b4c2d3..1a7ddd508b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxRun.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/FoxRun.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Horse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Horse.java index 77b3f5edac..631b566fe3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Horse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseInStableEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseInStableEvent.java index 67995800c3..d7e838309b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseInStableEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseInStableEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseStable.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseStable.java index 17f9f7c837..8006662517 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseStable.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/HorseStable.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/OtherSpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/OtherSpiderProducer.java index 7b5a7b83ad..cc014bfd55 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/OtherSpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/OtherSpiderProducer.java @@ -1,40 +1,40 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.dependent; - -import jakarta.annotation.PreDestroy; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class OtherSpiderProducer { - private static boolean destroyed = false; - - @Produces - @Tame - public Tarantula produceTarantula = new Tarantula(this.hashCode()); - - @PreDestroy - public void destroy() { - destroyed = true; - } - - public static boolean isDestroyed() { - return destroyed; - } - - public static void setDestroyed(boolean destroyed) { - OtherSpiderProducer.destroyed = destroyed; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.dependent; + +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class OtherSpiderProducer { + private static boolean destroyed = false; + + @Produces + @Tame + public Tarantula produceTarantula = new Tarantula(this.hashCode()); + + @PreDestroy + public void destroy() { + destroyed = true; + } + + public static boolean isDestroyed() { + return destroyed; + } + + public static void setDestroyed(boolean destroyed) { + OtherSpiderProducer.destroyed = destroyed; + } +} 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 aa92411552..4d65fd8758 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SensitiveFox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SensitiveFox.java index 21bd59b554..2a24cff993 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SensitiveFox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SensitiveFox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Spider.java index d24ba2b800..fad6ab290d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Spider.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.dependent; - -public class Spider implements Animal { - public final void layEggs() { - - } - - public void ping() { - - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.dependent; + +public class Spider implements Animal { + public final void layEggs() { + + } + + public void ping() { + + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SpiderProducer.java index 0b7fb71ac9..dc1d4c0c91 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Stable.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Stable.java index b47bf38bb1..b6a96b0d22 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Stable.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Stable.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 1f1866f751..e8ca1da01f 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.dependent; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Tame { - class Literal extends AnnotationLiteral implements Tame { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.dependent; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@Documented +@Qualifier +public @interface Tame { + class Literal extends AnnotationLiteral implements Tame { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tarantula.java index 94f4db3121..3b9f1223c2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Tarantula.java @@ -1,61 +1,61 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.dependent; - -import jakarta.annotation.PreDestroy; - -import jakarta.enterprise.context.Dependent; -import org.jboss.cdi.tck.impl.ConfigurationFactory; - -@Dependent -public class Tarantula extends Spider implements DeadlySpider { - - private static boolean destroyed; - - private static boolean dependentContextActive = false; - - private Integer producerInstanceHashcode = null; - - public Tarantula() { - dependentContextActive = ConfigurationFactory.get().getContexts().getDependentContext().isActive(); - } - - public Tarantula(Integer producerInstanceHashcode) { - dependentContextActive = ConfigurationFactory.get().getContexts().getDependentContext().isActive(); - this.producerInstanceHashcode = producerInstanceHashcode; - } - - @PreDestroy - public void preDestroy() { - destroyed = true; - } - - public Integer getProducerInstanceHashcode() { - return producerInstanceHashcode; - } - - public static boolean isDependentContextActive() { - return dependentContextActive; - } - - public static boolean isDestroyed() { - return destroyed; - } - - public static void reset() { - destroyed = false; - dependentContextActive = false; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.dependent; + +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.Dependent; + +import org.jboss.cdi.tck.impl.ConfigurationFactory; + +@Dependent +public class Tarantula extends Spider implements DeadlySpider { + + private static boolean destroyed; + + private static boolean dependentContextActive = false; + + private Integer producerInstanceHashcode = null; + + public Tarantula() { + dependentContextActive = ConfigurationFactory.get().getContexts().getDependentContext().isActive(); + } + + public Tarantula(Integer producerInstanceHashcode) { + dependentContextActive = ConfigurationFactory.get().getContexts().getDependentContext().isActive(); + this.producerInstanceHashcode = producerInstanceHashcode; + } + + @PreDestroy + public void preDestroy() { + destroyed = true; + } + + public Integer getProducerInstanceHashcode() { + return producerInstanceHashcode; + } + + public static boolean isDependentContextActive() { + return dependentContextActive; + } + + public static boolean isDestroyed() { + return destroyed; + } + + public static void reset() { + destroyed = false; + dependentContextActive = false; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Transactional.java index 8a0f831879..3406d06da8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/TransactionalInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/TransactionalInterceptor.java index f64ca1ea3c..5ebf80fe61 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/TransactionalInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/TransactionalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/BuiltinInstanceDependentObjectTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/BuiltinInstanceDependentObjectTest.java index ced938e6c6..685db03c08 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/BuiltinInstanceDependentObjectTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/BuiltinInstanceDependentObjectTest.java @@ -29,7 +29,7 @@ /** * An instance of a bean with scope @Dependent obtained by direct invocation of an Instance is a * dependent object of the instance of Instance. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/Foo.java index e857fcb7f3..da640960c9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/instance/Foo.java @@ -16,8 +16,8 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; - import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.SimpleLogger; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/transientreference/Meal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/transientreference/Meal.java index e13e5afd97..14fa5e7584 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/transientreference/Meal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/context/dependent/transientreference/Meal.java @@ -13,7 +13,6 @@ */ package org.jboss.cdi.tck.tests.context.dependent.transientreference; - public class Meal { private String name; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AbstractAntelope.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AbstractAntelope.java index 0144877a87..4752a17c7a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AbstractAntelope.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AbstractAntelope.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Animal.java index 89b44b5b25..b0eb4eb86d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AnimalStereotype.java index 3f8aeb37d7..98e41107b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/AnimalStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -public @interface AnimalStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +public @interface AnimalStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/BeanDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/BeanDefinitionTest.java index c6ffc3e087..fd8c132f04 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/BeanDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/BeanDefinitionTest.java @@ -31,8 +31,8 @@ import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; - import jakarta.enterprise.util.TypeLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -101,7 +101,8 @@ public void testBeanTypes() { @SpecAssertion(section = BEAN_TYPES, id = "l"), @SpecAssertion(section = BEAN, id = "ba") }) public void testGenericBeanTypes() { assertEquals(getBeans(MyRawBean.class).size(), 1); - Bean> bean = (Bean>) getCurrentManager().getBeans(MyGenericBean.class).iterator().next(); + Bean> bean = (Bean>) getCurrentManager().getBeans(MyGenericBean.class).iterator() + .next(); assertEquals(bean.getTypes().size(), 5); assertTrue(containsClass(bean.getTypes(), MyGenericBean.class)); @@ -134,7 +135,8 @@ public void testRawBeanTypes() { // JLS isn't clear itself and Java implementations either. So we need to keep it open and support both // https://bugs.openjdk.org/browse/JDK-8044366 assertTrue(bean.getTypes().contains(MySuperInterface.class) - || bean.getTypes().contains(new TypeLiteral>() {}.getType())); + || bean.getTypes().contains(new TypeLiteral>() { + }.getType())); assertTrue(bean.getTypes().contains(Object.class)); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/ComplicatedTuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/ComplicatedTuna.java index 278139b8a9..1ff1886380 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/ComplicatedTuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/ComplicatedTuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlyAnimal.java index f5a2f1c79d..ae7947ce0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlySpider.java index 7d421f3900..65f7a788ee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DependentFinalTuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DependentFinalTuna.java index 27bded2055..ac2faff646 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DependentFinalTuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/DependentFinalTuna.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import jakarta.enterprise.context.Dependent; - -@Dependent -final class DependentFinalTuna { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import jakarta.enterprise.context.Dependent; + +@Dependent +final class DependentFinalTuna { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FishStereotype.java index b7840dcf14..abfde2526f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FishStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Stereotype; -import jakarta.inject.Named; - -@Stereotype -@Target({ TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@Named -public @interface FishStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Named; + +@Stereotype +@Target({ TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +public @interface FishStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FriendlyAntelope.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FriendlyAntelope.java index 49288e3619..93aba10f64 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FriendlyAntelope.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/FriendlyAntelope.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Horse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Horse.java index 74d351c3cb..779b25eca4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Horse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class Horse { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/RedSnapper.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/RedSnapper.java index 0a5ddd0075..e7bc3ae6bc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/RedSnapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/RedSnapper.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import jakarta.enterprise.context.RequestScoped; - -@FishStereotype -@RequestScoped -public class RedSnapper implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import jakarta.enterprise.context.RequestScoped; + +@FishStereotype +@RequestScoped +public class RedSnapper implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Spider.java index 73a1e35283..baac799fd2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Spider.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Spider implements Animal { - - public final void layEggs() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Spider implements Animal { + + public final void layEggs() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/SpiderProducer.java index c82cf4ab1d..cdf9a7e490 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/SpiderProducer.java @@ -1,40 +1,40 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class SpiderProducer { - - @Produces - @AnimalStereotype - public WolfSpider produceWolfSpider() { - return new WolfSpider(); - } - - @Produces - @Tame - public Animal makeASpider() { - return new WolfSpider(); - } - - @Produces - @ProducedInteger - public int getWolfSpiderSize() { - return 4; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class SpiderProducer { + + @Produces + @AnimalStereotype + public WolfSpider produceWolfSpider() { + return new WolfSpider(); + } + + @Produces + @Tame + public Animal makeASpider() { + return new WolfSpider(); + } + + @Produces + @ProducedInteger + public int getWolfSpiderSize() { + return 4; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tame.java index 56d2fc708d..921851aca2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tame.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Tame { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Tame { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tarantula.java index 611e76375b..c6862a6af9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/Tarantula.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import jakarta.enterprise.context.Dependent; - -@Dependent -final class Tarantula extends Spider implements DeadlySpider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import jakarta.enterprise.context.Dependent; + +@Dependent +final class Tarantula extends Spider implements DeadlySpider { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/WolfSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/WolfSpider.java index 3a02d2fb8c..a2da286e4d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/WolfSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/WolfSpider.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class WolfSpider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class WolfSpider implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Animal.java index c565ce0c1b..8e1d37c3ef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,7 @@ import jakarta.enterprise.context.Dependent; /** - * + * * @author Martin Kouba */ @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Boulder.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Boulder.java index 9d08d54f84..6e85de77f0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Boulder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Boulder.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,7 +14,7 @@ package org.jboss.cdi.tck.tests.definition.bean.broken.restricted; /** - * + * * @author Martin Kouba */ public class Boulder { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderFieldProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderFieldProducer.java index 19f0ee5b79..e0fe74f0bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderFieldProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderFieldProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ import jakarta.enterprise.inject.Typed; /** - * + * * @author Martin Kouba */ @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderMethodProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderMethodProducer.java index 6392909ba6..902ca86e0c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderMethodProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/BoulderMethodProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ import jakarta.enterprise.inject.Typed; /** - * + * * @author Martin Kouba */ @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedManagedBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedManagedBeanTest.java index 501e6cc83f..5f6ba9693c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedManagedBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedManagedBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -43,7 +43,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = RESTRICTING_BEAN_TYPES, id = "j"), @SpecAssertion(section = EXCEPTIONS, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = RESTRICTING_BEAN_TYPES, id = "j"), + @SpecAssertion(section = EXCEPTIONS, id = "ba") }) public void testInvalidTypedValueOnManagedBean() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerFieldTest.java index b09c1fbdb4..9e0ecf2c33 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerMethodTest.java index d4ec7a60db..96c028c967 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/RestrictedProducerMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Stone.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Stone.java index aa2c0f6b3f..59acb99a69 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Stone.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/Stone.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ import jakarta.enterprise.inject.Typed; /** - * + * * @author Martin Kouba */ @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/FooBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/FooBroken.java index 9eae894aad..4c062c9b90 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/FooBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/FooBroken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java index 38df71deb8..e4aac36a48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/genericbroken/GenericManagedBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/Flock.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/Flock.java index 7f5fd8d991..ae98e70462 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/Flock.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/Flock.java @@ -16,11 +16,6 @@ import jakarta.enterprise.context.Dependent; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; - @Dependent public class Flock implements Gathering> { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/ManagedBeanTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/ManagedBeanTypesTest.java index d16f7519af..e73f14de48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/ManagedBeanTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/ManagedBeanTypesTest.java @@ -19,9 +19,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.Collection; -import java.util.List; - import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.TypeLiteral; @@ -36,7 +33,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class ManagedBeanTypesTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/Animal.java index f376f583c2..dad051a195 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/Animal.java @@ -19,7 +19,7 @@ @Dependent public class Animal { - public final void ping(){ + public final void ping() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/BeanTypesWithIllegalTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/BeanTypesWithIllegalTypeTest.java index 33d5824858..d9350a7beb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/BeanTypesWithIllegalTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/BeanTypesWithIllegalTypeTest.java @@ -61,10 +61,10 @@ public void producerMethodsetOfBeanTypesContainsOnlyLegalTypes() { getUniqueEagleAndCheckItsTypes(ProducedWithMethod.ProducedWithMethoddLiteral.INSTANCE); } - private void getUniqueEagleAndCheckItsTypes(Annotation... annotations){ + private void getUniqueEagleAndCheckItsTypes(Annotation... annotations) { Bean eagleBean = getUniqueBean(Eagle.class, annotations); for (Type type : eagleBean.getTypes()) { - if(type instanceof ParameterizedType){ + if (type instanceof ParameterizedType) { assertNotEquals(((ParameterizedType) type).getRawType(), AnimalHolder.class); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/EagleProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/EagleProducer.java index 966e922d83..01fc10caaa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/EagleProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/EagleProducer.java @@ -25,7 +25,7 @@ public class EagleProducer { @Produces @ProducedWithMethod - public Eagle createEagle(){ + public Eagle createEagle() { return new Eagle<>(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/ProducedWithField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/ProducedWithField.java index b9d54e5c7d..c66123162f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/ProducedWithField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/illegal/ProducedWithField.java @@ -33,7 +33,7 @@ @Qualifier public @interface ProducedWithField { - public static class ProducedWithFieldLiteral extends AnnotationLiteral implements ProducedWithField{ + public static class ProducedWithFieldLiteral extends AnnotationLiteral implements ProducedWithField { public static ProducedWithFieldLiteral INSTANCE = new ProducedWithFieldLiteral(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Animal.java index da99825d5b..5662e4f656 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/FishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/FishStereotype.java index 9f0c841ab1..05ca464688 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/FishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/FishStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Stereotype; -import jakarta.inject.Named; - -@Stereotype -@Target({ TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@Named -public @interface FishStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Named; + +@Stereotype +@Target({ TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +public @interface FishStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Haddock.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Haddock.java index 623331e77a..4c6acd99cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Haddock.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Haddock.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Default; -import jakarta.inject.Named; - -@Named -@Default -@Dependent -public class Haddock implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Named; + +@Named +@Default +@Dependent +public class Haddock implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Minnow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Minnow.java index 99e221b353..460dcd1e15 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Minnow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Minnow.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -@RiverFishStereotype -public class Minnow implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +@RiverFishStereotype +public class Minnow implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Moose.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Moose.java index 9bb95b22b2..00f5f58da4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Moose.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/Moose.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Default; -import jakarta.inject.Named; - -@Named("aMoose") -@Default -@Dependent -public class Moose implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Named; + +@Named("aMoose") +@Default +@Dependent +public class Moose implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/NameDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/NameDefinitionTest.java index cd4cb6c8e8..280d94d46e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/NameDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/NameDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RedSnapper.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RedSnapper.java index 2976730ec4..e51eec8449 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RedSnapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RedSnapper.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -import jakarta.enterprise.context.RequestScoped; - -@FishStereotype -@RequestScoped -public class RedSnapper implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +import jakarta.enterprise.context.RequestScoped; + +@FishStereotype +@RequestScoped +public class RedSnapper implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RiverFishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RiverFishStereotype.java index c8228892db..a1a6101048 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RiverFishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/RiverFishStereotype.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE }) -@Retention(RUNTIME) -public @interface RiverFishStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE }) +@Retention(RUNTIME) +public @interface RiverFishStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/SeaBass.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/SeaBass.java index a2e92665af..fc8d29e992 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/SeaBass.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/SeaBass.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.name; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class SeaBass implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.name; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class SeaBass implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/_Underscore.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/_Underscore.java index 1929d53c90..53b5e3687a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/_Underscore.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/name/_Underscore.java @@ -20,5 +20,4 @@ @Dependent public class _Underscore { - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Animal.java index b430cf1b29..d2f9c082cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Barn.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Barn.java index 4d23ed0dfd..950990e821 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Barn.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Barn.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import jakarta.enterprise.context.Dependent; -import jakarta.inject.Inject; - -@Dependent -public class Barn { - @Inject - @Tame - public Tarantula petSpider; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; + +@Dependent +public class Barn { + @Inject + @Tame + public Tarantula petSpider; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/BorderCollie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/BorderCollie.java index c1a2054d19..6e963066bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/BorderCollie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/BorderCollie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cat.java index b04554c797..9461945958 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cat.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import jakarta.enterprise.context.Dependent; - -@Synchronous -@Dependent -public class Cat { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import jakarta.enterprise.context.Dependent; + +@Synchronous +@Dependent +public class Cat { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Chunky.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Chunky.java index 082f788077..2823c5b1d9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Chunky.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Chunky.java @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Chunky { - - boolean realChunky(); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Chunky { + + boolean realChunky(); + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ChunkyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ChunkyQualifier.java index 84cf718dd1..88dc2e366e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ChunkyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ChunkyQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ClippedBorderCollie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ClippedBorderCollie.java index 252b0be2cd..17d494cd10 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ClippedBorderCollie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ClippedBorderCollie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cod.java index a404f2ce7a..c0ba9dde7e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Cod.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import jakarta.enterprise.context.Dependent; -import jakarta.inject.Named; - -@Whitefish -@Chunky(realChunky = true) -@Named("whitefish") -@Dependent -public class Cod implements ScottishFish { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Named; + +@Whitefish +@Chunky(realChunky = true) +@Named("whitefish") +@Dependent +public class Cod implements ScottishFish { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlyAnimal.java index 97e44545e7..edf0c59964 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlySpider.java index 0f5a9fd1d3..9d3f6bd914 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DefangedTarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DefangedTarantula.java index 7850e95d60..0ec9a49234 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DefangedTarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/DefangedTarantula.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -public class DefangedTarantula extends Tarantula { - - /** - * - */ - private static final long serialVersionUID = 4125502808853107948L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +public class DefangedTarantula extends Tarantula { + + /** + * + */ + private static final long serialVersionUID = 4125502808853107948L; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/EnglishBorderCollie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/EnglishBorderCollie.java index 03ce645c9e..d79a04e6d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/EnglishBorderCollie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/EnglishBorderCollie.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class EnglishBorderCollie extends BorderCollie { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class EnglishBorderCollie extends BorderCollie { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Hairy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Hairy.java index df7dbcf452..70c3b1362d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Hairy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Hairy.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/HairyQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/HairyQualifier.java index b74b5d90c8..5b3e77da6f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/HairyQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/HairyQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Horse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Horse.java index efbc02e343..a2371ba923 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Horse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/LongHairedDog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/LongHairedDog.java index da0233a218..e975d9348b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/LongHairedDog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/LongHairedDog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/MiniatureShetlandPony.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/MiniatureShetlandPony.java index 082e432709..80ed2bc1b6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/MiniatureShetlandPony.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/MiniatureShetlandPony.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Produced.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Produced.java index 2e96f73f6f..d3a1d17385 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Produced.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Produced.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Produced { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Produced { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/QualifierDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/QualifierDefinitionTest.java index e58164e8c4..2643051bf2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/QualifierDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/QualifierDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -51,7 +51,8 @@ public void testQualifierDeclaresBindingAnnotation() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_QUALIFIERS, id = "a"), @SpecAssertion(section = DECLARING_MANAGED_BEAN, id = "be") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_QUALIFIERS, id = "a"), + @SpecAssertion(section = DECLARING_MANAGED_BEAN, id = "be") }) public void testQualifiersDeclaredInJava() { Bean cat = getBeans(Cat.class, new SynchronousQualifier()).iterator().next(); assert cat.getQualifiers().size() == 2; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ScottishFish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ScottishFish.java index 3366d4d660..7b1295413e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ScottishFish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ScottishFish.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -public interface ScottishFish extends Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +public interface ScottishFish extends Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ShetlandPony.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ShetlandPony.java index 7fa5f33df7..7e74143ebc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ShetlandPony.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/ShetlandPony.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Species.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Species.java index fac925158c..e69b3970e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Species.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Species.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Spider.java index b2a5876a4e..7b8ff8cea1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Spider.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -public class Spider implements Animal { - - public final void layEggs() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +public class Spider implements Animal { + + public final void layEggs() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SpiderProducer.java index fd83eb075b..29c10a1a24 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SpiderProducer.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class SpiderProducer { - - @Produces - @Tame - public Tarantula produceTameTarantula() { - return new DefangedTarantula(); - } - - @Produces - @Produced - public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) { - return tarantula; - } - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class SpiderProducer { + + @Produces + @Tame + public Tarantula produceTameTarantula() { + return new DefangedTarantula(); + } + + @Produces + @Produced + public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) { + return tarantula; + } + } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Synchronous.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Synchronous.java index d30c0e24d5..fbc6e51d34 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Synchronous.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Synchronous.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Synchronous { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Synchronous { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SynchronousQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SynchronousQualifier.java index d40c4893bb..24f11c66d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SynchronousQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/SynchronousQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tame.java index adaceeb5ae..1711cbe180 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tame.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Tame { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Tame { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/TameLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/TameLiteral.java index 1e2968e475..789e025c59 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/TameLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/TameLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tarantula.java index 7eb10b2ee7..de421ceae9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tarantula.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import java.io.Serializable; - -public class Tarantula extends Spider implements DeadlySpider, Serializable { - - /** - * - */ - private static final long serialVersionUID = 1L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import java.io.Serializable; + +public class Tarantula extends Spider implements DeadlySpider, Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tuna.java index 7ca858f2cb..1f1c2fe646 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Tuna.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class Tuna { - - public String getName() { - return "Ophir"; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class Tuna { + + public String getName() { + return "Ophir"; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Whitefish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Whitefish.java index baa69ec164..19393bad24 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Whitefish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/Whitefish.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Whitefish { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Whitefish { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/WhitefishQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/WhitefishQualifier.java index 677b06a2a9..8564f67414 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/WhitefishQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/WhitefishQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BeanProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BeanProducer.java index c9b987591d..2e9fdaa522 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BeanProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BeanProducer.java @@ -20,24 +20,24 @@ @Dependent public class BeanProducer { - + @Produces @Named @Any - public ProducedNamedAnyBean producedNamedAnyBean(){ + public ProducedNamedAnyBean producedNamedAnyBean() { return new ProducedNamedAnyBean(); } @Produces @Any - public ProducedAnyBean producedAnyBean(){ + public ProducedAnyBean producedAnyBean() { return new ProducedAnyBean(); } @Produces @Named - public ProducedNamedBean producedNamedBean(){ + public ProducedNamedBean producedNamedBean() { return new ProducedNamedBean(); } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BuiltInQualifierDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BuiltInQualifierDefinitionTest.java index bf0cbe1133..1d57237dba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BuiltInQualifierDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/BuiltInQualifierDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -45,7 +45,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BUILTIN_QUALIFIERS, id = "aa"), @SpecAssertion(section = BUILTIN_QUALIFIERS, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = BUILTIN_QUALIFIERS, id = "aa"), + @SpecAssertion(section = BUILTIN_QUALIFIERS, id = "ab") }) public void testDefaultQualifierDeclaredInJava() { Bean order = getBeans(Order.class).iterator().next(); assertEquals(order.getQualifiers().size(), 2); @@ -67,7 +68,8 @@ public void testDefaultQualifierForInjectionPoint() { public void testNamedAndAnyBeanHasDefaultQualifier() { Bean nameAnyBeanBean = getUniqueBean(NamedAnyBean.class, Any.Literal.INSTANCE); assertEquals(nameAnyBeanBean.getQualifiers().size(), 3); - checkSetContainsAllQuallifiers(nameAnyBeanBean.getQualifiers(), Default.Literal.INSTANCE, NamedLiteral.of("namedAnyBean"), Any.Literal.INSTANCE); + checkSetContainsAllQuallifiers(nameAnyBeanBean.getQualifiers(), Default.Literal.INSTANCE, + NamedLiteral.of("namedAnyBean"), Any.Literal.INSTANCE); } @Test @@ -75,7 +77,8 @@ public void testNamedAndAnyBeanHasDefaultQualifier() { public void testNamedBeanHasDefaultQualifier() { Bean namedBean = getUniqueBean(NamedBean.class); assertEquals(namedBean.getQualifiers().size(), 3); - checkSetContainsAllQuallifiers(namedBean.getQualifiers(), Default.Literal.INSTANCE, NamedLiteral.of("namedBean"), Any.Literal.INSTANCE); + checkSetContainsAllQuallifiers(namedBean.getQualifiers(), Default.Literal.INSTANCE, NamedLiteral.of("namedBean"), + Any.Literal.INSTANCE); } @Test @@ -91,7 +94,8 @@ public void testAnyBeanHasDefaultQualifier() { public void testProducedNamedAndAnyBeanHasDefaultQualifier() { Bean producedNamedAnyBeanBean = getUniqueBean(ProducedNamedAnyBean.class); assertEquals(producedNamedAnyBeanBean.getQualifiers().size(), 3); - checkSetContainsAllQuallifiers(producedNamedAnyBeanBean.getQualifiers(), Default.Literal.INSTANCE, NamedLiteral.of("producedNamedAnyBean"), + checkSetContainsAllQuallifiers(producedNamedAnyBeanBean.getQualifiers(), Default.Literal.INSTANCE, + NamedLiteral.of("producedNamedAnyBean"), Any.Literal.INSTANCE); } @@ -100,7 +104,8 @@ public void testProducedNamedAndAnyBeanHasDefaultQualifier() { public void testProducedNamedBeanHasDefaultQualifier() { Bean producedNamedBeanBean = getUniqueBean(ProducedNamedBean.class); assertEquals(producedNamedBeanBean.getQualifiers().size(), 3); - checkSetContainsAllQuallifiers(producedNamedBeanBean.getQualifiers(), Default.Literal.INSTANCE, NamedLiteral.of("producedNamedBean"), Any.Literal.INSTANCE); + checkSetContainsAllQuallifiers(producedNamedBeanBean.getQualifiers(), Default.Literal.INSTANCE, + NamedLiteral.of("producedNamedBean"), Any.Literal.INSTANCE); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/Order.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/Order.java index 1cf3f77046..8685d2616a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/Order.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/Order.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.builtin; - -import jakarta.enterprise.context.Dependent; -import jakarta.inject.Inject; - -@Dependent -public class Order { - @Inject - public Order(OrderProcessor processor) { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.builtin; + +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; + +@Dependent +public class Order { + @Inject + public Order(OrderProcessor processor) { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/OrderProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/OrderProcessor.java index eff0aa4a41..aa14d9ace3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/OrderProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/builtin/OrderProcessor.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.builtin; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class OrderProcessor { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.builtin; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class OrderProcessor { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/repeatable/Start.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/repeatable/Start.java index 0b3c547dde..28a42a5583 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/repeatable/Start.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/repeatable/Start.java @@ -18,6 +18,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Animal.java index b581f6cd00..cbcb0657a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnimalStereotype.java index 01b9b80889..eb396a9f15 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnimalStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -public @interface AnimalStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +public @interface AnimalStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScope.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScope.java index df6b3796a5..f068f3c451 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScope.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScope.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScopeType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScopeType.java index 5bfdc26257..75ff16396d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScopeType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/AnotherScopeType.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.NormalScope; - -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@Documented -@NormalScope -public @interface AnotherScopeType { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.NormalScope; + +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@Documented +@NormalScope +public @interface AnotherScopeType { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/BorderCollie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/BorderCollie.java index 334fc56b20..2a576cc31d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/BorderCollie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/BorderCollie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Clydesdale.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Clydesdale.java index 0bdfd4f67b..a27ab037b0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Clydesdale.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Clydesdale.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Dog.java index a707ab11f6..4ebfb06fe3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/DummyStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/DummyStereotype.java index ff5d4486b8..a7cba0b7b7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/DummyStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/DummyStereotype.java @@ -16,11 +16,11 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.inject.Stereotype; + // technically useless stereotype that only serves as bean defining annotation @Stereotype @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/EnglishBorderCollie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/EnglishBorderCollie.java index 70ec3a511f..d82c6b687b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/EnglishBorderCollie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/EnglishBorderCollie.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -@DummyStereotype -public class EnglishBorderCollie extends BorderCollie { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +@DummyStereotype +public class EnglishBorderCollie extends BorderCollie { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/FishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/FishStereotype.java index d0e0317fbd..fe80b08fbb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/FishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/FishStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Stereotype; -import jakarta.inject.Named; - -@Stereotype -@Target({ TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@Named -public @interface FishStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Named; + +@Stereotype +@Target({ TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +public @interface FishStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenLabrador.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenLabrador.java index 035aca79e4..903eaacd96 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenLabrador.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenLabrador.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenRetriever.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenRetriever.java index 53e0d9362e..61ed5c4f8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenRetriever.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/GoldenRetriever.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Grayling.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Grayling.java index 8aa8631433..4ba5262cf0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Grayling.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Grayling.java @@ -1,20 +1,20 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -@RiverFishStereotype -@FishStereotype -public class Grayling implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +@RiverFishStereotype +@FishStereotype +public class Grayling implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Horse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Horse.java index 817d5b9dc1..feea05cf02 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Horse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Labrador.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Labrador.java index 07e609df5d..997f18e8f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Labrador.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Labrador.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/MiniatureClydesdale.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/MiniatureClydesdale.java index 64d73d168d..b45e9f4c88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/MiniatureClydesdale.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/MiniatureClydesdale.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Minnow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Minnow.java index 921e438172..1c66b004b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Minnow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Minnow.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import jakarta.enterprise.context.RequestScoped; - -@RiverFishStereotype -@RequestScoped -public class Minnow implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import jakarta.enterprise.context.RequestScoped; + +@RiverFishStereotype +@RequestScoped +public class Minnow implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Mullet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Mullet.java index 1fac6bf8f8..3055ac8953 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Mullet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Mullet.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -@AnotherScopeType -public class Mullet { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +@AnotherScopeType +public class Mullet { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/NotInheritedScope.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/NotInheritedScope.java index e5acff3732..3bf5b76717 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/NotInheritedScope.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/NotInheritedScope.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Order.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Order.java index 898e3ecafe..554eafeabb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Order.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Order.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -@DummyStereotype -public class Order { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +@DummyStereotype +public class Order { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Pollock.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Pollock.java index fbc705e0cb..fffe4d69dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Pollock.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Pollock.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import jakarta.enterprise.context.Dependent; - -@AnimalStereotype -@FishStereotype -@Dependent -public class Pollock implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import jakarta.enterprise.context.Dependent; + +@AnimalStereotype +@FishStereotype +@Dependent +public class Pollock implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RedSnapper.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RedSnapper.java index c04ee4c081..f13894a999 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RedSnapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RedSnapper.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import jakarta.enterprise.context.RequestScoped; - -@FishStereotype -@RequestScoped -public class RedSnapper implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import jakarta.enterprise.context.RequestScoped; + +@FishStereotype +@RequestScoped +public class RedSnapper implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Retriever.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Retriever.java index fc7573113b..c1d5218f54 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Retriever.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/Retriever.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RiverFishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RiverFishStereotype.java index 5835166508..114cacbf0f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RiverFishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/RiverFishStereotype.java @@ -1,31 +1,31 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -public @interface RiverFishStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +public @interface RiverFishStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ScopeDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ScopeDefinitionTest.java index cc1d61112f..0501e568d1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ScopeDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ScopeDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -93,7 +93,8 @@ public void testDefaultScope() { } @Test - @SpecAssertions({ @SpecAssertion(section = DEFAULT_SCOPE, id = "e"), @SpecAssertion(section = DECLARING_STEREOTYPES, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = DEFAULT_SCOPE, id = "e"), + @SpecAssertion(section = DECLARING_STEREOTYPES, id = "a") }) public void testScopeSpecifiedAndStereotyped() { assert getBeans(Minnow.class).size() == 1; Bean bean = getBeans(Minnow.class).iterator().next(); @@ -117,7 +118,8 @@ public void testMultipleCompatibleScopeStereotypes() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "db"), @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "db"), + @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "ab") }) public void testWebBeanScopeTypeOverridesStereotype() { assert getBeans(RedSnapper.class).size() == 1; Bean bean = getBeans(RedSnapper.class).iterator().next(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/SeaBass.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/SeaBass.java index ec95641dcf..5c5850b72c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/SeaBass.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/SeaBass.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class SeaBass implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class SeaBass implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ShetlandPony.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ShetlandPony.java index ab0bc53489..cccacb9ada 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ShetlandPony.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/ShetlandPony.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java index 714d667156..8c883cd9c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -@ApplicationScoped -public class BeanWithTooManyScopeTypes_Broken { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +@ApplicationScoped +public class BeanWithTooManyScopeTypes_Broken { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java index e6d6cf0e9c..fc03496f31 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,11 +34,13 @@ public class TooManyScopesTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(TooManyScopesTest.class).withClass(BeanWithTooManyScopeTypes_Broken.class).build(); + return new WebArchiveBuilder().withTestClass(TooManyScopesTest.class).withClass(BeanWithTooManyScopeTypes_Broken.class) + .build(); } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "ba"), @SpecAssertion(section = EXCEPTIONS, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "ba"), + @SpecAssertion(section = EXCEPTIONS, id = "ba") }) public void testTooManyScopesSpecifiedInJava() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldTooManyScopesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldTooManyScopesTest.java index 293e2e6c41..444ac0fd2f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldTooManyScopesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldTooManyScopesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,11 +34,13 @@ public class ProducerFieldTooManyScopesTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ProducerFieldTooManyScopesTest.class).withClass(ProducerFieldWithTooManyScopeTypes_Broken.class).build(); + return new WebArchiveBuilder().withTestClass(ProducerFieldTooManyScopesTest.class) + .withClass(ProducerFieldWithTooManyScopeTypes_Broken.class).build(); } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "bc"), @SpecAssertion(section = EXCEPTIONS, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "bc"), + @SpecAssertion(section = EXCEPTIONS, id = "ba") }) public void testTooManyScopesSpecifiedInJava() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldWithTooManyScopeTypes_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldWithTooManyScopeTypes_Broken.java index 9cec770f2a..082ed5c444 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldWithTooManyScopeTypes_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/ProducerFieldWithTooManyScopeTypes_Broken.java @@ -1,27 +1,27 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.producer.field; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class ProducerFieldWithTooManyScopeTypes_Broken { - @Produces - @Dependent - @ApplicationScoped - @Word - public String word = "producer_field"; +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.producer.field; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class ProducerFieldWithTooManyScopeTypes_Broken { + @Produces + @Dependent + @ApplicationScoped + @Word + public String word = "producer_field"; } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/Word.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/Word.java index 6c177398c4..ddb3c472bc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/Word.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/field/Word.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodTooManyScopesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodTooManyScopesTest.java index eda0c6364a..eb7d7e565e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodTooManyScopesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodTooManyScopesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,11 +34,13 @@ public class ProducerMethodTooManyScopesTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ProducerMethodTooManyScopesTest.class).withClass(ProducerMethodWithTooManyScopeTypes_Broken.class).build(); + return new WebArchiveBuilder().withTestClass(ProducerMethodTooManyScopesTest.class) + .withClass(ProducerMethodWithTooManyScopeTypes_Broken.class).build(); } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "bb"), @SpecAssertion(section = EXCEPTIONS, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "bb"), + @SpecAssertion(section = EXCEPTIONS, id = "ba") }) public void testTooManyScopesSpecifiedInJava() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodWithTooManyScopeTypes_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodWithTooManyScopeTypes_Broken.java index 54676a5801..bbbeef7e18 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodWithTooManyScopeTypes_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/ProducerMethodWithTooManyScopeTypes_Broken.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.producer.method; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class ProducerMethodWithTooManyScopeTypes_Broken { - @Produces - @RequestScoped - @Dependent - @Word - public String getWord() { - return "producer_method"; - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.producer.method; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class ProducerMethodWithTooManyScopeTypes_Broken { + @Produces + @RequestScoped + @Dependent + @Word + public String getWord() { + return "producer_method"; + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/Word.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/Word.java index ad5385a98b..097b26cfcd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/Word.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/producer/method/Word.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ScopeDefinedInOtherBDATest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ScopeDefinedInOtherBDATest.java index 1fd589fbd1..23cd855efa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ScopeDefinedInOtherBDATest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ScopeDefinedInOtherBDATest.java @@ -35,7 +35,8 @@ public class ScopeDefinedInOtherBDATest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { JavaArchive lib = ShrinkWrap.create(JavaArchive.class).addClass(ThirdPartyScope.class); - return new WebArchiveBuilder().withTestClass(ScopeDefinedInOtherBDATest.class).withClasses(ThirdPartyScopeBean.class).withLibraries(lib).build(); + return new WebArchiveBuilder().withTestClass(ScopeDefinedInOtherBDATest.class).withClasses(ThirdPartyScopeBean.class) + .withLibraries(lib).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ThirdPartyScopeBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ThirdPartyScopeBean.java index 9704fcb4f4..0a58d63b62 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ThirdPartyScopeBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/scope/inOtherBda/ThirdPartyScopeBean.java @@ -15,6 +15,7 @@ @ThirdPartyScope public class ThirdPartyScopeBean { - - public void ping(){} + + public void ping() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Animal.java index 97e5b1e414..8d672f34d6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnimalStereotype.java index 279db196a5..3fbc5319e0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnimalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnotherStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnotherStereotype.java index be70e2f661..f8f7bc0766 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnotherStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/AnotherStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java index 34070d8251..cece241b11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ApplicationScopedHornedMammalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/BorderCollie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/BorderCollie.java index e625c8707d..9b08ed18ba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/BorderCollie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/BorderCollie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Chihuahua.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Chihuahua.java index f0b64ff705..2cd2eb66a4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Chihuahua.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Chihuahua.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype; - -public class Chihuahua extends ShortHairedDog { - - /** - * - */ - private static final long serialVersionUID = 484594567205158344L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype; + +public class Chihuahua extends ShortHairedDog { + + /** + * + */ + private static final long serialVersionUID = 484594567205158344L; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Clydesdale.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Clydesdale.java index 79d21fc376..b5dee0eb81 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Clydesdale.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Clydesdale.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/DummyStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/DummyStereotype.java index ac321b7836..148c130c5e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/DummyStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/DummyStereotype.java @@ -18,11 +18,11 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.inject.Stereotype; + // servers purely as bean defining annotation @Stereotype @Target({ TYPE, METHOD, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/EnglishBorderCollie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/EnglishBorderCollie.java index 7db5228b52..9f0d1710e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/EnglishBorderCollie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/EnglishBorderCollie.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype; - -@DummyStereotype -public class EnglishBorderCollie extends BorderCollie { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype; + +@DummyStereotype +public class EnglishBorderCollie extends BorderCollie { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goat.java index 6b80a31c91..40c7d10bb7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goat.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype; - -@NonStereotype -public class Goat { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype; + +@NonStereotype +public class Goat { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goldfish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goldfish.java index d9dc04923b..b9c1ae5ebc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goldfish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Goldfish.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HighlandCow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HighlandCow.java index 730f7ea942..53e9c974f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HighlandCow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HighlandCow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HornedMammalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HornedMammalStereotype.java index 4ed40790ea..7882bafc0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HornedMammalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/HornedMammalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Horse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Horse.java index 4d27acb548..ed04309b20 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Horse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/LongHairedDog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/LongHairedDog.java index 12f6f498ff..402be94d79 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/LongHairedDog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/LongHairedDog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MexicanChihuahua.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MexicanChihuahua.java index 35c7a9db78..c86a8301a8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MexicanChihuahua.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MexicanChihuahua.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype; - -@DummyStereotype -public class MexicanChihuahua extends Chihuahua { - - /** - * - */ - private static final long serialVersionUID = 6596918293280396284L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype; + +@DummyStereotype +public class MexicanChihuahua extends Chihuahua { + + /** + * + */ + private static final long serialVersionUID = 6596918293280396284L; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MiniatureClydesdale.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MiniatureClydesdale.java index fc5324aa2c..07796303d5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MiniatureClydesdale.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/MiniatureClydesdale.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Moose.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Moose.java index 5570bc642f..23748a3a11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Moose.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Moose.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/NonStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/NonStereotype.java index cdbc57c327..79199676ba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/NonStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/NonStereotype.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target({ TYPE }) -@Retention(RUNTIME) -public @interface NonStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Target({ TYPE }) +@Retention(RUNTIME) +public @interface NonStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Reindeer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Reindeer.java index 6028271ba1..7071c496df 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Reindeer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Reindeer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShetlandPony.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShetlandPony.java index feca7f7b40..aabd98fac3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShetlandPony.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShetlandPony.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShortHairedDog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShortHairedDog.java index 388b1cc7c0..09bfb7bb74 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShortHairedDog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/ShortHairedDog.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype; - -import jakarta.enterprise.context.ApplicationScoped; - -import java.io.Serializable; - -@AnimalStereotype -@ApplicationScoped -public class ShortHairedDog implements Animal, Serializable { - - /** - * - */ - private static final long serialVersionUID = 1859229950272574260L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype; + +import java.io.Serializable; + +import jakarta.enterprise.context.ApplicationScoped; + +@AnimalStereotype +@ApplicationScoped +public class ShortHairedDog implements Animal, Serializable { + + /** + * + */ + private static final long serialVersionUID = 1859229950272574260L; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Springbok.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Springbok.java index 80cd910012..ae71bd88e9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Springbok.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/Springbok.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 adc8921fe2..77ce41e39f 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,6 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -49,21 +48,24 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = STEREOTYPE_DEFAULT_SCOPE, id = "aa"), @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "c") }) + @SpecAssertions({ @SpecAssertion(section = STEREOTYPE_DEFAULT_SCOPE, id = "aa"), + @SpecAssertion(section = DECLARING_BEAN_SCOPE, id = "c") }) public void testStereotypeWithScopeType() { assert getBeans(Moose.class).size() == 1; assert getBeans(Moose.class).iterator().next().getScope().equals(RequestScoped.class); } @Test - @SpecAssertions({ @SpecAssertion(section = STEREOTYPE_DEFAULT_SCOPE, id = "aa"), @SpecAssertion(section = DEFAULT_SCOPE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = STEREOTYPE_DEFAULT_SCOPE, id = "aa"), + @SpecAssertion(section = DEFAULT_SCOPE, id = "b") }) public void testStereotypeWithoutScopeType() { assert getBeans(Reindeer.class).size() == 1; assert getBeans(Reindeer.class).iterator().next().getScope().equals(Dependent.class); } @Test - @SpecAssertions({ @SpecAssertion(section = STEREOTYPES, id = "c"), @SpecAssertion(section = DEFINING_NEW_STEREOTYPE, id = "b"), + @SpecAssertions({ @SpecAssertion(section = STEREOTYPES, id = "c"), + @SpecAssertion(section = DEFINING_NEW_STEREOTYPE, id = "b"), @SpecAssertion(section = SPECIFY_STEREOTYPE_INTERCEPTOR_BINDINGS, id = "a") }) public void testOneStereotypeAllowed() { Bean bean = getBeans(LongHairedDog.class).iterator().next(); @@ -71,7 +73,8 @@ public void testOneStereotypeAllowed() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "e"), @SpecAssertion(section = STEREOTYPES, id = "d") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "e"), + @SpecAssertion(section = STEREOTYPES, id = "d") }) public void testMultipleStereotypesAllowed() { assert getBeans(HighlandCow.class, TAME_LITERAL).size() == 1; Bean highlandCow = getBeans(HighlandCow.class, TAME_LITERAL).iterator().next(); @@ -81,7 +84,8 @@ public void testMultipleStereotypesAllowed() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "e"), @SpecAssertion(section = DEFAULT_SCOPE, id = "e") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "e"), + @SpecAssertion(section = DEFAULT_SCOPE, id = "e") }) public void testExplicitScopeOverridesMergedScopesFromMultipleStereotype() { assert getBeans(Springbok.class).size() == 1; assert getBeans(Springbok.class).iterator().next().getScope().equals(RequestScoped.class); 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 0b3d0c6835..31cc442e32 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/AnotherPriorityStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/AnotherPriorityStereotype.java index 31f13ea9fa..8615c4d3a5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/AnotherPriorityStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/AnotherPriorityStereotype.java @@ -13,15 +13,16 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities; -import jakarta.annotation.Priority; -import jakarta.enterprise.inject.Stereotype; -import org.jboss.cdi.tck.tests.definition.stereotype.priority.PriorityStereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Stereotype; + +import org.jboss.cdi.tck.tests.definition.stereotype.priority.PriorityStereotype; + /** * Stereotype with {@code @Priority} that also declares another stereotype with {@code @Priority} */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPrioritiesFromSingleStereotypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPrioritiesFromSingleStereotypeTest.java index 947dabf05d..97a0dc8d9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPrioritiesFromSingleStereotypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPrioritiesFromSingleStereotypeTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPriorityStereotypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPriorityStereotypesTest.java index 56168bb583..5a7617b64f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPriorityStereotypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/ConflictingPriorityStereotypesTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/PriorityStereotype2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/PriorityStereotype2.java index a61a97b85c..01449abf21 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/PriorityStereotype2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/PriorityStereotype2.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities; -import jakarta.annotation.Priority; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Stereotype; + /** * Simple stereotype with priority different than * {@link org.jboss.cdi.tck.tests.definition.stereotype.priority.PriorityStereotype}. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/SomeBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/SomeBean.java index 21a1a21e8f..c6ccab7f4c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/SomeBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/SomeBean.java @@ -15,6 +15,7 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Alternative; + import org.jboss.cdi.tck.tests.definition.stereotype.priority.PriorityStereotype; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherDumbStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherDumbStereotype.java index de73e1611a..2f62e2a234 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherDumbStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherDumbStereotype.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities.inherited; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.inject.Stereotype; + @Stereotype @AnotherStereotypeWithPriority @Target(ElementType.TYPE) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherStereotypeWithPriority.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherStereotypeWithPriority.java index aba45cac8c..103cd661c3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherStereotypeWithPriority.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/AnotherStereotypeWithPriority.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities.inherited; -import jakarta.annotation.Priority; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Stereotype; + @Stereotype @Priority(200) @Target(ElementType.TYPE) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/StereotypeInheritedPriorityConflictTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/StereotypeInheritedPriorityConflictTest.java index 0d159c8a76..f3c9adec79 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/StereotypeInheritedPriorityConflictTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/multiplePriorities/inherited/StereotypeInheritedPriorityConflictTest.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.definition.stereotype.broken.multiplePriorities.inherited; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java index 8be337ff9b..41dec18c3f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java index 7b575f93b7..8fe1c0ece7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java index efa7fe783b..5277929723 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java index 9120aa142a..c8cd472f49 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -public @interface AnimalStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +public @interface AnimalStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java index 3ee5a32382..7ddca7f255 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java @@ -1,31 +1,31 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -public @interface FishStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +public @interface FishStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java index 7cbd0bd6bd..793fc30242 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java index 5a2282d079..3ae708fc24 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict; - -/** - * This bean definition is invalid because it declares two stereotypes that have different default scopes and the bean does not - * explictly define a scope to resolve the conflict. - */ -@AnimalStereotype -@FishStereotype -public class Scallop_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict; + +/** + * This bean definition is invalid because it declares two stereotypes that have different default scopes and the bean does not + * explictly define a scope to resolve the conflict. + */ +@AnimalStereotype +@FishStereotype +public class Scallop_Broken { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/AnimalStereotype.java index c7dfc19cfc..3b6de7b150 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/AnimalStereotype.java @@ -13,17 +13,17 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict.transitive; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + @Stereotype @Target({ TYPE, METHOD, FIELD }) @Retention(RUNTIME) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/FishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/FishStereotype.java index e65471e6e3..6be4e3f1fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/FishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/FishStereotype.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict.transitive; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Stereotype; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; @Stereotype @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/TransitiveIncompatibleStereotypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/TransitiveIncompatibleStereotypesTest.java index 9df343af4a..92b36e5a6c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/TransitiveIncompatibleStereotypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/scopeConflict/transitive/TransitiveIncompatibleStereotypesTest.java @@ -13,7 +13,10 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.broken.scopeConflict.transitive; +import static org.jboss.cdi.tck.cdi.Sections.DEFAULT_SCOPE; + import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -24,8 +27,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.cdi.Sections.DEFAULT_SCOPE; - @SpecVersion(spec = "cdi", version = "2.0") public class TransitiveIncompatibleStereotypesTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/Elk_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/Elk_Broken.java index fba160d4ec..76399074fa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/Elk_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/Elk_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java index ac7587942f..10806f5b9c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java index 02101d34e3..67dc8a4f32 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/tooManyScopes/TooManyScopeTypesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,7 +38,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = STEREOTYPE_DEFAULT_SCOPE, id = "ab"), @SpecAssertion(section = EXCEPTIONS, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = STEREOTYPE_DEFAULT_SCOPE, id = "ab"), + @SpecAssertion(section = EXCEPTIONS, id = "b") }) public void testStereotypeWithTooManyScopeTypes() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java index 8e10601202..14f4ebd123 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/Asynchronous.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/RoeDeer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/RoeDeer_Broken.java index e8d8b28a1a..3899618847 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/RoeDeer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/RoeDeer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java index 974d6d7cb1..7d807f9550 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereoTypeWithBindingTypesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java index 71d94c264e..135073d097 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/broken/withBindingType/StereotypeWithBindingTypes_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/Horse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/Horse.java index 8adb059ed5..3c4e35c45e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/Horse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ @NamedRequestPolicyStereotype public class Horse { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java index e86af39f18..12d8f2a938 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestPolicyStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java index d0ce47f17c..1863a59988 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedRequestStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedStereotype.java index 92996895e5..1966d73e6d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/NamedStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java index 7e59ce539f..7c79ced16b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/inheritance/StereotypeInheritenceTest.java @@ -15,8 +15,11 @@ import static org.jboss.cdi.tck.cdi.Sections.STEREOTYPES_WITH_ADDITIONAL_STEREOTYPES; +import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -28,8 +31,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - /** * @author pmuir * @author Martin Kouba @@ -46,7 +47,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({@SpecAssertion(section = STEREOTYPES_WITH_ADDITIONAL_STEREOTYPES, id = "a"), @SpecAssertion(section = STEREOTYPES_WITH_ADDITIONAL_STEREOTYPES, id = "b")}) + @SpecAssertions({ @SpecAssertion(section = STEREOTYPES_WITH_ADDITIONAL_STEREOTYPES, id = "a"), + @SpecAssertion(section = STEREOTYPES_WITH_ADDITIONAL_STEREOTYPES, id = "b") }) public void testInheritence() { Set> beans = getBeans(Horse.class); assert beans.size() == 1; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaInterceptor.java index 3d2d414b80..7aacf399ee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaInterceptor.java @@ -18,7 +18,7 @@ import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -@Alpha(value=true) +@Alpha(value = true) @Interceptor @Priority(Interceptor.Priority.APPLICATION) public class AlphaInterceptor { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaOmegaStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaOmegaStereotype.java index c76c9d4d6f..6cd70d48b0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaOmegaStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/AlphaOmegaStereotype.java @@ -1,38 +1,38 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.interceptor; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.inject.Stereotype; - -/** - * Stereotype with two interceptor bindings. - * - * @author Martin Kouba - */ -@Alpha(value=false) -@Omega -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -public @interface AlphaOmegaStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.interceptor; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.inject.Stereotype; + +/** + * Stereotype with two interceptor bindings. + * + * @author Martin Kouba + */ +@Alpha(value = false) +@Omega +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +public @interface AlphaOmegaStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Foo.java index ac065cf971..1617513983 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Foo.java @@ -18,7 +18,7 @@ import jakarta.enterprise.context.Dependent; -@Alpha(value=true) +@Alpha(value = true) @AlphaOmegaStereotype @Dependent public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Omega.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Omega.java index 6350808e74..b278d44865 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Omega.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/Omega.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/OmegaInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/OmegaInterceptor.java index 500a1039cc..c019a41592 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/OmegaInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/OmegaInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ @Omega @Interceptor -@Priority(Interceptor.Priority.APPLICATION+1) +@Priority(Interceptor.Priority.APPLICATION + 1) public class OmegaInterceptor { @AroundInvoke diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java index 58d2b9aee9..88a15ed59d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/StereotypeWithMultipleInterceptorBindingsTest.java @@ -22,7 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/DefaultNamedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/DefaultNamedTest.java index 5c6709bc53..789e8cb69f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/DefaultNamedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/DefaultNamedTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/FallowDeer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/FallowDeer.java index 263b32df9b..c0ab2c3696 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/FallowDeer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/FallowDeer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/RoeDeer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/RoeDeer.java index f7f684907d..25b84aeaad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/RoeDeer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/RoeDeer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,7 @@ import jakarta.inject.Named; /** - * + * * @author Martin Kouba */ @Named("roe") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/StereotypeWithEmptyNamed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/StereotypeWithEmptyNamed.java index ed8fb516ba..2bec397ad1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/StereotypeWithEmptyNamed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/named/StereotypeWithEmptyNamed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/AlternativePriorityStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/AlternativePriorityStereotype.java index 82ab483a0a..08a4083bb3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/AlternativePriorityStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/AlternativePriorityStereotype.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.priority; -import jakarta.enterprise.inject.Alternative; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Stereotype; + /** * Makes the bean {@code @Alternative} and declares {@code @PriorityStereotype} so it inherits {@code @Priority} */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/PriorityStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/PriorityStereotype.java index 56a779dac9..da48620983 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/PriorityStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/PriorityStereotype.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.priority; -import jakarta.annotation.Priority; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Stereotype; + /** * Simple stereotype with @Priority */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/StereotypeWithPriorityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/StereotypeWithPriorityTest.java index 6e13d78219..bd1d0656f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/StereotypeWithPriorityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/StereotypeWithPriorityTest.java @@ -16,6 +16,7 @@ import static org.testng.Assert.assertEquals; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/DumbStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/DumbStereotype.java index 6317eb6289..1d800b283b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/DumbStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/DumbStereotype.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.priority.inherited; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.inject.Stereotype; + /** * Doesn't add anything but declares another stereotype with priority. */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeInheritedPriorityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeInheritedPriorityTest.java index 0ad432f36b..a425ad31dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeInheritedPriorityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeInheritedPriorityTest.java @@ -18,6 +18,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeWithPriority.java b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeWithPriority.java index ce297ed46b..55c7889048 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeWithPriority.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/priority/inherited/StereotypeWithPriority.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.tests.definition.stereotype.priority.inherited; -import jakarta.annotation.Priority; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.annotation.Priority; +import jakarta.enterprise.inject.Stereotype; + @Stereotype @Priority(100) @Target(ElementType.TYPE) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java index 3edc7c243e..c5bd445442 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/EmptyBeansXmlDiscoveryTest.java @@ -18,6 +18,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.spi.CDI; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/SomeAnnotatedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/SomeAnnotatedBean.java index 3263f57c8c..e1fd335d7c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/SomeAnnotatedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/SomeAnnotatedBean.java @@ -18,5 +18,6 @@ @Dependent public class SomeAnnotatedBean { - public void pong(){} + public void pong() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/BullTerrier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/BullTerrier.java index cbec311d50..29094f26c9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/BullTerrier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/BullTerrier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Delivery.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Delivery.java index 2d0f90f198..d9913d9e84 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Delivery.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Delivery.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Egg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Egg.java index 2d2c90c85f..95a90b10ed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Egg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Egg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventPayload.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventPayload.java index 8f8e8d0cbc..b1c902eb34 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventPayload.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventPayload.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventTest.java index a9d17d0d42..925410c290 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/EventTest.java @@ -53,7 +53,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "i"), @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "c"), + @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "i"), + @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "c"), @SpecAssertion(section = METHOD_CONSTRUCTOR_PARAMETER_QUALIFIERS, id = "ca"), @SpecAssertion(section = INJECTION_POINT_DEFAULT_QUALIFIER, id = "a") }) public void testObserverMethodParameterInjectionPoints() { @@ -68,7 +69,8 @@ public void testObserverMethodParameterInjectionPoints() { * adapter. */ @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = OBSERVER_METHODS, id = "c"), @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVER_METHODS, id = "c"), + @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "a") }) public void testStaticObserverMethodInvoked() { Context requestContext = getCurrentConfiguration().getContexts().getRequestContext(); @@ -102,12 +104,14 @@ public void testEventObjectContainsTypeVariablesWhenResolvingFails() { } @Test - @SpecAssertions({ @SpecAssertion(section = MULTIPLE_EVENT_QUALIFIERS, id = "a"), @SpecAssertion(section = MULTIPLE_EVENT_QUALIFIERS, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = MULTIPLE_EVENT_QUALIFIERS, id = "a"), + @SpecAssertion(section = MULTIPLE_EVENT_QUALIFIERS, id = "b") }) public void testObserverMethodNotifiedWhenQualifiersMatch() { BullTerrier.reset(); - getCurrentManager().getEvent().select(MultiBindingEvent.class, new RoleLiteral("Admin"), new TameAnnotationLiteral()).fire(new MultiBindingEvent()); + getCurrentManager().getEvent().select(MultiBindingEvent.class, new RoleLiteral("Admin"), new TameAnnotationLiteral()) + .fire(new MultiBindingEvent()); assertTrue(BullTerrier.isMultiBindingEventObserved()); assertTrue(BullTerrier.isSingleBindingEventObserved()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Farmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Farmer.java index 4b0d703b90..5ff1854e3f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Farmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Farmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/IndirectStockWatcher.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/IndirectStockWatcher.java index e10fe0c343..b8e0ca45cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/IndirectStockWatcher.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/IndirectStockWatcher.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class IndirectStockWatcher extends IntermediateStockWatcher { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class IndirectStockWatcher extends IntermediateStockWatcher { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/IntermediateStockWatcher.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/IntermediateStockWatcher.java index 25d64b0513..967359a508 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/IntermediateStockWatcher.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/IntermediateStockWatcher.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class IntermediateStockWatcher extends StockWatcher { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class IntermediateStockWatcher extends StockWatcher { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/LazyFarmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/LazyFarmer.java index 2220c461b7..f5a4554266 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/LazyFarmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/LazyFarmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/MultiBindingEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/MultiBindingEvent.java index 613e5270d7..515b8784a2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/MultiBindingEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/MultiBindingEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/OrangeCheekedWaxbill.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/OrangeCheekedWaxbill.java index d4a2c7922b..386bf545d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/OrangeCheekedWaxbill.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/OrangeCheekedWaxbill.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/PrivateObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/PrivateObserver.java index 002f0eeb4f..056291920b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/PrivateObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/PrivateObserver.java @@ -18,16 +18,15 @@ @RequestScoped public class PrivateObserver { - + public static boolean isObserved = false; - - private void observesDelivery(@Observes Delivery delivery){ - isObserved = true; + + private void observesDelivery(@Observes Delivery delivery) { + isObserved = true; } - - public static void reset(){ + + public static void reset() { isObserved = false; } - - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Role.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Role.java index 709e99d3f6..3ac1625aea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Role.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Role.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -@Qualifier -public @interface Role { - String value(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +@Qualifier +public @interface Role { + String value(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/RoleLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/RoleLiteral.java index 198132783c..a26b8b169a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/RoleLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/RoleLiteral.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class RoleLiteral extends AnnotationLiteral implements Role { - private String value = null; - - public RoleLiteral(String value) { - this.value = value; - } - - public String value() { - return value; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class RoleLiteral extends AnnotationLiteral implements Role { + private String value = null; + + public RoleLiteral(String value) { + this.value = value; + } + + public String value() { + return value; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/StaticObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/StaticObserver.java index 5b2f15d9c9..3e50b5f545 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/StaticObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/StaticObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockPrice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockPrice.java index 51335913e5..ce3186eba0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockPrice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockPrice.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event; - -public class StockPrice extends EventPayload { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event; + +public class StockPrice extends EventPayload { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockWatcher.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockWatcher.java index 9cb3893f6f..69b27797a4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockWatcher.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/StockWatcher.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.event.Observes; - -@Dependent -public class StockWatcher { - - public void observeStockPrice(@Observes StockPrice price) { - price.recordVisit(this); - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; + +@Dependent +public class StockWatcher { + + public void observeStockPrice(@Observes StockPrice price) { + price.recordVisit(this); + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Tame.java index f560470099..e45b12f9f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/TameAnnotationLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/TameAnnotationLiteral.java index f9f107c14a..86344bc982 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/TameAnnotationLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/TameAnnotationLiteral.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event; - -import jakarta.enterprise.util.AnnotationLiteral; - -@SuppressWarnings("all") -public class TameAnnotationLiteral extends AnnotationLiteral implements Tame { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event; + +import jakarta.enterprise.util.AnnotationLiteral; + +@SuppressWarnings("all") +public class TameAnnotationLiteral extends AnnotationLiteral implements Tame { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/TerrierObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/TerrierObserver.java index 1227b75074..566ac7913f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/TerrierObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/TerrierObserver.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class TerrierObserver { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Volume.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Volume.java index 61e8b583f4..ae679137db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/Volume.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/Volume.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Animal.java index 3343d727c7..c05bbbacc6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/AnimalAssessment.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/AnimalAssessment.java index 5df62ef33d..d454eab8c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/AnimalAssessment.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/AnimalAssessment.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/DiscerningObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/DiscerningObserver.java index 53e577c6b5..ec1646d8f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/DiscerningObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/DiscerningObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 90ed7ee53d..20072108b9 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,6 @@ import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.TypeLiteral; import org.jboss.arquillian.container.test.api.Deployment; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventEmitter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventEmitter.java index c2799771b4..e5832da121 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventEmitter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/EventEmitter.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 6469e454d6..42d9b72a92 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 @@ -6,15 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.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; @@ -22,6 +20,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; + @Target({ FIELD, PARAMETER }) @Retention(RUNTIME) public @interface 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 383ab0b4b0..04eb246842 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Tame.java index 7dfd6b5f9a..6012e5c7d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/TameAnnotationLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/TameAnnotationLiteral.java index 85ddafd09c..8fe66a0a5e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/TameAnnotationLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/TameAnnotationLiteral.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.bindingTypes; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class TameAnnotationLiteral extends AnnotationLiteral implements Tame { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.bindingTypes; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class TameAnnotationLiteral extends AnnotationLiteral implements Tame { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Wild.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Wild.java index 83d6805060..cee76ac562 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Wild.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/Wild.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/WildAnnotationLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/WildAnnotationLiteral.java index fd5a74285e..ca5d30642b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/WildAnnotationLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/bindingTypes/WildAnnotationLiteral.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.bindingTypes; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class WildAnnotationLiteral extends AnnotationLiteral implements Wild { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.bindingTypes; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class WildAnnotationLiteral extends AnnotationLiteral implements Wild { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/AbstractBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/AbstractBean.java index 6901a049bb..8681a40539 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/AbstractBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/AbstractBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ConcreteBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ConcreteBean.java index 2d4cb3f19a..84cb7d0896 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ConcreteBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ConcreteBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java index 0ab35a5f4a..0233798023 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * This class is not a bean since it does not have a default constructor nor does it have a constructor annotated with {@link * jakarta.inject.Inject}. As such, an observer method is not detected on this class. - * + * * @author David Allen */ public class NonManagedBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java index 3ca71d4c67..f0b4427255 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -25,7 +25,7 @@ /** * Tests an observer method on something that is not a managed bean or a session bean. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/BrokenObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/BrokenObserver.java index a7ef11473d..3ea7fcac09 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/BrokenObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/BrokenObserver.java @@ -20,7 +20,7 @@ @Dependent public class BrokenObserver { - public void observe(@Observes @ObservesAsync Integer test){ + public void observe(@Observes @ObservesAsync Integer test) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/ObserverMethodParameterAnnotatedAsSyncAndAsyncTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/ObserverMethodParameterAnnotatedAsSyncAndAsyncTest.java index 5305ef5eb1..d1c1cfe21b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/ObserverMethodParameterAnnotatedAsSyncAndAsyncTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/bothObservesAnnotations/ObserverMethodParameterAnnotatedAsSyncAndAsyncTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,8 @@ public class ObserverMethodParameterAnnotatedAsSyncAndAsyncTest extends Abstract @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withClasses(BrokenObserver.class).withTestClass(ObserverMethodParameterAnnotatedAsSyncAndAsyncTest.class) + return new WebArchiveBuilder().withClasses(BrokenObserver.class) + .withTestClass(ObserverMethodParameterAnnotatedAsSyncAndAsyncTest.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java index 41dc4396cc..cfcf33340b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/BreakIn.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/BreakIn.java index 81c1f52e06..1f388acbd5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/BreakIn.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/BreakIn.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java index fc4abaddbe..40d4d6e5b6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/dependentIsConditionalObserver/DependentIsConditionalObserverTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/DeploymentFailureTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/DeploymentFailureTest.java index 3917264bcf..1b8ee1aa1a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/DeploymentFailureTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/DeploymentFailureTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/InitializerBean_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/InitializerBean_Broken.java index 079286a58c..636b38e7a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/InitializerBean_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/inject/InitializerBean_Broken.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.broken.observer.inject; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.event.Observes; -import jakarta.inject.Inject; - -@Dependent -public class InitializerBean_Broken { - @Inject - public void initialize(@Observes String string) { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.broken.observer.inject; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; + +@Dependent +public class InitializerBean_Broken { + @Inject + public void initialize(@Observes String string) { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java index 575b42be64..4f3bee4b5a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/FoxTerrier_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,7 @@ public class FoxTerrier_Broken { /* * (non-Javadoc) - * + * * @see org.jboss.cdi.tck.unit.event.broken.observer6.Terrier#observeInitialized(jakarta.inject.manager.Manager, * java.lang.String) */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java index ad1000bb63..faeaf6de47 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isDisposer/ObserverMethodAnnotatedDisposesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,7 @@ /** * Tests an observer method that is also a disposes method for something else. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java index 19a232dd0c..a3d9f20354 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/BorderTerrier_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,8 +20,7 @@ @Dependent public class BorderTerrier_Broken { - public @Produces - String observesAfterBeanDiscovery(@Observes AfterBeanDiscovery event) { + public @Produces String observesAfterBeanDiscovery(@Observes AfterBeanDiscovery event) { return "product"; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java index fd2d491747..462b65c1fc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/isProducer/ObserverMethodAnnotatedProducesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ /** * Tests an observer method which is also annotated as a producer method. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/Boxer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/Boxer.java index c4f0bbabea..f0bfd3b874 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/Boxer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/Boxer.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.broken.observer.tooManyParameters; - -public class Boxer { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.broken.observer.tooManyParameters; + +public class Boxer { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithObservesAndObservesAsyncParametersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithObservesAndObservesAsyncParametersTest.java index b76dc13c59..0f252ba3e7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithObservesAndObservesAsyncParametersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithObservesAndObservesAsyncParametersTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,8 @@ public class ObserverMethodWithObservesAndObservesAsyncParametersTest extends Ab @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withClasses(Poodle_Broken.class, Boxer.class).withTestClass(ObserverMethodWithObservesAndObservesAsyncParametersTest.class) + return new WebArchiveBuilder().withClasses(Poodle_Broken.class, Boxer.class) + .withTestClass(ObserverMethodWithObservesAndObservesAsyncParametersTest.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java index 78567bb799..5991a75d12 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,8 @@ public class ObserverMethodWithTwoEventParametersTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withClasses(YorkshireTerrier_Broken.class, Boxer.class).withTestClass(ObserverMethodWithTwoEventParametersTest.class) + return new WebArchiveBuilder().withClasses(YorkshireTerrier_Broken.class, Boxer.class) + .withTestClass(ObserverMethodWithTwoEventParametersTest.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java index a3afda2440..8cdc395c26 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ConstructorInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ConstructorInjectionBar.java index 6821d6ca17..bcc4f66434 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ConstructorInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ConstructorInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class ConstructorInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/DisposerMethodInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/DisposerMethodInjectionBar.java index 35fae63aba..1caea33297 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/DisposerMethodInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/DisposerMethodInjectionBar.java @@ -21,7 +21,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class DisposerMethodInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/FieldInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/FieldInjectionBar.java index 2831d269ab..18c411ec4e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/FieldInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/FieldInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class FieldInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/Foo.java index 391622cd58..6b093b034e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/Foo.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package org.jboss.cdi.tck.tests.event.broken.raw; import jakarta.enterprise.context.Dependent; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/InitMethodInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/InitMethodInjectionBar.java index c66b4f7aab..510a06c5b8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/InitMethodInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/InitMethodInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @SuppressWarnings("rawtypes") @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ObserverInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ObserverInjectionBar.java index 04041b9d00..558a3f08eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ObserverInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ObserverInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class ObserverInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ProducerMethodInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ProducerMethodInjectionBar.java index f2071c8b47..77eda65085 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ProducerMethodInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/ProducerMethodInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class ProducerMethodInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventConstructorInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventConstructorInjectionTest.java index 03d599fc0d..0cf6ae4b66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventConstructorInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventConstructorInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawEventConstructorInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventDisposerInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventDisposerInjectionTest.java index cf372e0c21..4b98784f5d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventDisposerInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventDisposerInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawEventDisposerInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventFieldInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventFieldInjectionTest.java index ea43b95562..7574bc2493 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventFieldInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventFieldInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawEventFieldInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventInitMethodInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventInitMethodInjectionTest.java index 8bd55ee5ea..04b442631c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventInitMethodInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventInitMethodInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawEventInitMethodInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventObserverInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventObserverInjectionTest.java index ae51fabb7f..8e65427d8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventObserverInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventObserverInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawEventObserverInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventProducerMethodInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventProducerMethodInjectionTest.java index 9feefb1d47..2a7bbc6d7f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventProducerMethodInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/broken/raw/RawEventProducerMethodInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawEventProducerMethodInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/AbstractEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/AbstractEvent.java index 5f57062d10..a5add92c83 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/AbstractEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/AbstractEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,7 +16,7 @@ /** * Abstract level of event hierarchy used to test firing a concrete type and observing each of the event types associated with * that concrete type. - * + * * @author David Allen */ abstract class AbstractEvent implements GeneralEvent { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Artist.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Artist.java index ff71961ade..74cd7baff3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Artist.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Artist.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Broadcast.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Broadcast.java index 30a25fc5d7..f09751e37b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Broadcast.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Broadcast.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/ComplexEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/ComplexEvent.java index b033544f44..a8379d743b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/ComplexEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/ComplexEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * An event type with a class/interface hierarchy complex enough to test observing all event types. - * + * * @author David Allen */ public class ComplexEvent extends AbstractEvent implements GeneralEvent { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypeFamilyObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypeFamilyObserver.java index b95c37b4f8..4e2dfbd400 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypeFamilyObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/EventTypeFamilyObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * This class declares observer methods for every superclass and interface contained in the hierarchy for the * {@link ComplexEvent} event type. - * + * * @author David Allen */ @Dependent 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 e41daa283b..05161470b1 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,7 +31,7 @@ import org.testng.annotations.Test; /** - * + * * @author Dan Allen * @author Martin Kouba */ @@ -55,7 +55,8 @@ public static WebArchive createTestArchive() { Event intArrayEvent; @Test - @SpecAssertions({ @SpecAssertion(section = EVENT_TYPES_AND_QUALIFIER_TYPES, id = "aa"), @SpecAssertion(section = EVENT_TYPES_AND_QUALIFIER_TYPES, id = "j") }) + @SpecAssertions({ @SpecAssertion(section = EVENT_TYPES_AND_QUALIFIER_TYPES, id = "aa"), + @SpecAssertion(section = EVENT_TYPES_AND_QUALIFIER_TYPES, id = "j") }) public void testEventTypeIsConcreteTypeWithNoTypeVariables() { Listener listener = getContextualReference(Listener.class); listener.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/GeneralEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/GeneralEvent.java index 1c7dd81306..ff9d835e39 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/GeneralEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/GeneralEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * Arbitrary interface to test firing events and observing all event types. - * + * * @author David Allen */ public interface GeneralEvent { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Listener.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Listener.java index fd79697330..25ca78c182 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Listener.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Listener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Solo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Solo.java index 6527320dd8..74fa4a1c07 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Solo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Solo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Song.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Song.java index 3ec4ec3ca9..4d5cbe3307 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Song.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/Song.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/TuneSelect.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/TuneSelect.java index 2191bfb382..b40a8ee190 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/TuneSelect.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/eventTypes/TuneSelect.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Bar.java index de96172265..6aeddc43ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Billing.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Billing.java index c1cc6bd8c6..4177412aa3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Billing.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Billing.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DogWhisperer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DogWhisperer.java index e8f8895116..8cf7f3728f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DogWhisperer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DogWhisperer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DoggiePoints.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DoggiePoints.java index 46f352e674..77e3a883fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DoggiePoints.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/DoggiePoints.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java index 9437a3e329..29eb33a215 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/FireEventTest.java @@ -71,7 +71,8 @@ public void testBeanManagerFireEvent() { getCurrentManager().getEvent().select(MiniBar.class).fire(miniBar); assertTrue(billing.isActive()); Item chocolate = miniBar.getItemByName("Chocolate"); - getCurrentManager().getEvent().select(Item.class, new Lifted.LiftedLiteral(){}).fire(chocolate); + getCurrentManager().getEvent().select(Item.class, new Lifted.LiftedLiteral() { + }).fire(chocolate); assertEquals(billing.getCharge(), 5); } @@ -90,7 +91,7 @@ public void testDuplicateBindingsToFireEventFails() throws Exception { }).fire(new Object()); } -/** + /** * This test verifies that the {@link Event} object capable of firing {@link Item} objects can be injected with the {@link * Any} binding type and that the injected object can be used to fire an event. The functionality is verified by checking * that the corresponding observer gets invoked. @@ -127,7 +128,8 @@ public void testInjectedAnyEventCanFireEvent() { **/ // Simplify assertions @Test(groups = REWRITE) - @SpecAssertions({ @SpecAssertion(section = FIRING_EVENTS_SYNCHRONOUSLY, id = "b"), @SpecAssertion(section = EVENT, id = "cb") }) + @SpecAssertions({ @SpecAssertion(section = FIRING_EVENTS_SYNCHRONOUSLY, id = "b"), + @SpecAssertion(section = EVENT, id = "cb") }) public void testInjectedEventAcceptsEventObject() throws SecurityException, NoSuchFieldException, NoSuchMethodException { Billing billing = getContextualReference(Billing.class); billing.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Foo.java index e0965b1548..2b273354c0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Housekeeping.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Housekeeping.java index 029ae2008a..efbdac9e1b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Housekeeping.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Housekeeping.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item.java index d7220e7ad9..16fd93b2c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.event.fires; - public class Item { private String name; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item_Illegal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item_Illegal.java index 59f31eb35f..ba96fa3836 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item_Illegal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Item_Illegal.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.event.fires; - public class Item_Illegal extends Item { public Item_Illegal(String name, int price) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Lifted.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Lifted.java index 365622e3e4..a9ade01ab7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Lifted.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Lifted.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -40,15 +40,15 @@ public static class LiftedLiteral extends AnnotationLiteral implements L private String value; - public LiftedLiteral(){ + public LiftedLiteral() { this.value = ""; } - public LiftedLiteral(String value){ - this.value = value; + public LiftedLiteral(String value) { + this.value = value; } - public String value(){ + public String value() { return value; } 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 214b0b02aa..ccde7dfe1b 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,6 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Any; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Praise.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Praise.java index a68d693dae..95be5eb941 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Praise.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Praise.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 3bcab23dc1..f2bf4440e8 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Role.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Role.java index 7c33752b4f..378f0e6a16 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Role.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Role.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.fires; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -@Qualifier -public @interface Role { - String value(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.fires; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +@Qualifier +public @interface Role { + String value(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Tame.java index 75e572799f..223cac035a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/TamingCommand.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/TamingCommand.java index 7826e6e62f..7cbadff528 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/TamingCommand.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/TamingCommand.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotype.java index 17dba4519a..783641ce26 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java index 9bc73bc30d..18d4e6c2e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java index 19c7ffcacc..79f515f824 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java index a06127017d..3582cf0e01 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/FireSyncEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/FireSyncEventTest.java index 5e0fda1e39..995ab59b9b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/FireSyncEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/FireSyncEventTest.java @@ -44,7 +44,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = FIRING_EVENTS_SYNCHRONOUSLY, id = "e"), @SpecAssertion(section = FIRING_EVENTS_SYNCHRONOUSLY, id = "f") }) + @SpecAssertions({ @SpecAssertion(section = FIRING_EVENTS_SYNCHRONOUSLY, id = "e"), + @SpecAssertion(section = FIRING_EVENTS_SYNCHRONOUSLY, id = "f") }) public void testSyncObservesCalledInSameThread() { event.fire(new Letter()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/Helper.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/Helper.java index 35568430c9..bd6e41ac7b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/Helper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/fires/sync/Helper.java @@ -25,7 +25,7 @@ public class Helper { private int counter = 0; - public void addThreadID(Integer id){ + public void addThreadID(Integer id) { threadIDs.add(id); } @@ -36,8 +36,8 @@ public Set getThreadIDs() { public int getCounter() { return counter; } - - public void incrementCount(){ + + public void incrementCount() { counter++; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/AwardEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/AwardEvent.java index 1de0d9ebc7..df79becbc7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/AwardEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/AwardEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Awards.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Awards.java index 810ed1f058..089eb99fb2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Awards.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Awards.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,7 @@ @Dependent public class Awards { - private @Any - @Honors - Event honorsAwardEvent; + private @Any @Honors Event honorsAwardEvent; public void grantHonorsStatus(Student student) { honorsAwardEvent.fire(new AwardEvent(student)); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Course.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Course.java index 79bf066910..019e10d329 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Course.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Course.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/CourseFullEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/CourseFullEvent.java index d0b32f8cca..ae5be9d875 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/CourseFullEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/CourseFullEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Honors.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Honors.java index 27ebc2d927..177643bb99 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Honors.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Honors.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/HonorsLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/HonorsLiteral.java index 03f63cd16b..742f4d327f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/HonorsLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/HonorsLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/ImplicitEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/ImplicitEventTest.java index acc2013a08..07a69b02e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/ImplicitEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/ImplicitEventTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -37,7 +37,7 @@ /** * Test that there is an implicit event bean for every legal event type and verify its composition. - * + * * @author Dan Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Registration.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Registration.java index 633c01b2fd..ca5c1f914a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Registration.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Registration.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Student.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Student.java index 5cb6a6d108..93d25decd0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Student.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/Student.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentDirectory.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentDirectory.java index df3a753bc9..425c0a2131 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentDirectory.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentDirectory.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentRegisteredEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentRegisteredEvent.java index eed3e5f116..a8b1cab1dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentRegisteredEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/implicit/StudentRegisteredEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/ObservingBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/ObservingBean.java index 5f2f2456e2..efd0c5fe5e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/ObservingBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/ObservingBean.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.event.lifecycle; +import java.util.ArrayList; +import java.util.List; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.BeforeDestroyed; import jakarta.enterprise.context.Initialized; @@ -20,9 +23,6 @@ import jakarta.enterprise.event.Shutdown; import jakarta.enterprise.event.Startup; -import java.util.ArrayList; -import java.util.List; - @ApplicationScoped public class ObservingBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/StartupShutdownTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/StartupShutdownTest.java index 4878b8239f..5db597735d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/StartupShutdownTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/lifecycle/StartupShutdownTest.java @@ -17,6 +17,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Startup; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/DuckNotifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/DuckNotifier.java index 5844951d64..36d9fd03fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/DuckNotifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/DuckNotifier.java @@ -51,15 +51,12 @@ public void fireStringDuck() { public void fireMapDuck() { observer.reset(); - mapDuckEvent.fire(new Duck>()); + mapDuckEvent.fire(new Duck>()); } - public void fireListDuck() { observer.reset(); listDuckEvent.fire(new ArrayList>()); } - - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/EventMetadataTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/EventMetadataTest.java index 37c14d0afd..01a3ae9d31 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/EventMetadataTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/EventMetadataTest.java @@ -18,7 +18,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/SimpleEventObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/SimpleEventObserver.java index 9c2b5e8f50..29bf839523 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/SimpleEventObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/SimpleEventObserver.java @@ -31,7 +31,6 @@ public EventMetadata getSyncMetadata() { return syncMetadata; } - public void reset() { this.syncMetadata = null; this.asyncMetadata = null; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/EventMetadataInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/EventMetadataInjectionPointTest.java index a4493f8626..2a4f53f9d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/EventMetadataInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/EventMetadataInjectionPointTest.java @@ -69,7 +69,8 @@ public static WebArchive createTestArchive() { InfoObserver infoObserver; @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "aa"), @SpecAssertion(section = EVENT_METADATA, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "aa"), + @SpecAssertion(section = EVENT_METADATA, id = "b") }) public void testGetBean() { Bean lastBean = null; @@ -91,7 +92,8 @@ public void testGetBean() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "dca"), @SpecAssertion(section = EVENT_METADATA, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "dca"), + @SpecAssertion(section = EVENT_METADATA, id = "b") }) public void testIsTransient() { notifier.fireInfoEvent(); @@ -103,7 +105,8 @@ public void testIsTransient() { @SuppressWarnings("serial") @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "ba"), @SpecAssertion(section = EVENT_METADATA, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "ba"), + @SpecAssertion(section = EVENT_METADATA, id = "b") }) public void testGetType() { Type lastType = null; @@ -128,7 +131,8 @@ public void testGetType() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "bc"), @SpecAssertion(section = EVENT_METADATA, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "bc"), + @SpecAssertion(section = EVENT_METADATA, id = "b") }) public void testGetQualifiers() { Set lastQualifiers = null; @@ -181,7 +185,8 @@ public void testGetMember() { @SuppressWarnings("rawtypes") @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "daa"), @SpecAssertion(section = EVENT_METADATA, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "daa"), + @SpecAssertion(section = EVENT_METADATA, id = "b") }) public void testGetAnnotatedType() { Annotated lastAnnotated = null; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Nice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Nice.java index 5c29753baa..eeb6a20904 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Nice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Nice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Notifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Notifier.java index ddc9ea1216..1c71071784 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Notifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/metadata/injectionpoint/Notifier.java @@ -66,4 +66,3 @@ public void fireInitializerInfoEvent() { initializerInjectionInfoEvent.fire(new Info()); } } - diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnEventType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnEventType.java index 093eda5151..d4a42c56d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnEventType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnEventType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnObserver.java index 55a360a0ce..27b14bb090 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherEventType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherEventType.java index 267a249102..fda5fa9ad8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherEventType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherEventType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherObserver.java index d7bac94a04..208d46c0ff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/AnotherObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/DisabledObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/DisabledObserver.java index 2cbfdea21f..842bc31d47 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/DisabledObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/DisabledObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/EventPayload.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/EventPayload.java index 23d7cc3f95..31294bc597 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/EventPayload.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/EventPayload.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/LastObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/LastObserver.java index 5466104792..ea7c82e93f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/LastObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/LastObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/ObserverNotificationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/ObserverNotificationTest.java index 43e09ccb43..2d815ec60c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/ObserverNotificationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/ObserverNotificationTest.java @@ -41,7 +41,8 @@ public static WebArchive createTestArchive() { @Test @SpecAssertions({ @SpecAssertion(section = OBSERVER_RESOLUTION, id = "c"), - @SpecAssertion(section = OBSERVER_RESOLUTION, id = "d"), @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "aa") }) + @SpecAssertion(section = OBSERVER_RESOLUTION, id = "d"), + @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "aa") }) public void testObserversNotified() { AnEventType anEvent = new AnEventType(); @@ -83,7 +84,8 @@ public void testObserverMethodNotInvokedIfNoActiveContext() { try { setContextInactive(requestContext); // Observer method not called - there is no context active for its scope - getCurrentManager().getEvent().select(AnEventType.class, new RoleLiteral("Admin", "hurray")).fire(new AnEventType()); + getCurrentManager().getEvent().select(AnEventType.class, new RoleLiteral("Admin", "hurray")) + .fire(new AnEventType()); assertFalse(AnotherObserver.wasNotified); } finally { setContextActive(requestContext); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/Role.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/Role.java index c9c8594acc..d12064fac0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/Role.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/Role.java @@ -1,38 +1,38 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.util.Nonbinding; -import jakarta.inject.Qualifier; - -@Qualifier -@Retention(RUNTIME) -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -public @interface Role { - - String value(); - - @Nonbinding - String nonbindingValue() default "blabla"; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; + +@Qualifier +@Retention(RUNTIME) +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +public @interface Role { + + String value(); + + @Nonbinding + String nonbindingValue() default "blabla"; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/RoleLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/RoleLiteral.java index 25797abca9..8ec9855c44 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/RoleLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/RoleLiteral.java @@ -1,41 +1,41 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer; - -import jakarta.enterprise.util.AnnotationLiteral; - -@SuppressWarnings("all") -public class RoleLiteral extends AnnotationLiteral implements Role { - - private static final long serialVersionUID = 1L; - - private String value = null; - - private String nonbindingValue = null; - - public RoleLiteral(String value, String nonbindingValue) { - this.value = value; - this.nonbindingValue = nonbindingValue; - } - - public String value() { - return value; - } - - @Override - public String nonbindingValue() { - return nonbindingValue; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer; + +import jakarta.enterprise.util.AnnotationLiteral; + +@SuppressWarnings("all") +public class RoleLiteral extends AnnotationLiteral implements Role { + + private static final long serialVersionUID = 1L; + + private String value = null; + + private String nonbindingValue = null; + + public RoleLiteral(String value, String nonbindingValue) { + this.value = value; + this.nonbindingValue = nonbindingValue; + } + + public String value() { + return value; + } + + @Override + public String nonbindingValue() { + return nonbindingValue; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java index 1adb6a88b5..dc7dfd954c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/ExceptionInOrderedObserversAbortsProcessingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/ExceptionInOrderedObserversAbortsProcessingTest.java index 9c2985df84..9c08b30f73 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/ExceptionInOrderedObserversAbortsProcessingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/ExceptionInOrderedObserversAbortsProcessingTest.java @@ -42,7 +42,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "cd"), @SpecAssertion(section = OBSERVER_ORDERING, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "cd"), + @SpecAssertion(section = OBSERVER_ORDERING, id = "b") }) public void testOrderedObserversAbortedCorrectly() { try { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/OrderedObservers.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/OrderedObservers.java index 836881c8f9..8791dae9d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/OrderedObservers.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/abortProcessing/orderedObservers/OrderedObservers.java @@ -40,7 +40,7 @@ public void goodFriendsObserves(@Observes @Priority(Interceptor.Priority.APPLICA public void othersObserves(@Observes @Priority(Interceptor.Priority.APPLICATION + 100) Invitation invitation) { othersInvited = true; } - + public class CancelledException extends RuntimeException { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/basic/Experiment.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/basic/Experiment.java index 461ee28c3e..527aba6d66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/basic/Experiment.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/basic/Experiment.java @@ -27,5 +27,5 @@ public void addUniversity(Class university) { } private List> universities = new CopyOnWriteArrayList<>(); - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/CustomExecutor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/CustomExecutor.java index 4123bcbe9b..690dcfa62e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/CustomExecutor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/CustomExecutor.java @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class CustomExecutor implements Executor { - + public static final AtomicBoolean executed = new AtomicBoolean(false); @Override diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/MessageObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/MessageObserver.java index d44d41b656..99ca5cc234 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/MessageObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/executor/MessageObserver.java @@ -20,10 +20,10 @@ @Dependent public class MessageObserver { - + public static final AtomicBoolean observed = new AtomicBoolean(false); - - public void observes(@ObservesAsync Message message){ - observed.set(true); + + public void observes(@ObservesAsync Message message) { + observed.set(true); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/MultipleExceptionsInObserversNotificationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/MultipleExceptionsInObserversNotificationTest.java index 337817511f..6462cf1df6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/MultipleExceptionsInObserversNotificationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/MultipleExceptionsInObserversNotificationTest.java @@ -61,7 +61,7 @@ public void testMultipleExceptionsDuringVariousObserversNotification() throws In assertTrue(NewYorkRadioStation.observed.get()); assertTrue(ParisRadioStation.observed.get()); assertTrue(PragueRadioStation.observed.get()); - + assertTrue(throwable instanceof CompletionException); List suppressedExceptions = Arrays.asList(throwable.getSuppressed()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/NewYorkRadioStation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/NewYorkRadioStation.java index c004dc0a70..198998df2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/NewYorkRadioStation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/NewYorkRadioStation.java @@ -21,10 +21,10 @@ @Dependent public class NewYorkRadioStation { - + public static AtomicBoolean observed = new AtomicBoolean(false); public static AtomicReference exception; - + public void observe(@ObservesAsync RadioMessage radioMessage) throws Exception { observed.set(true); // throw exception only on certain condition @@ -33,5 +33,5 @@ public void observe(@ObservesAsync RadioMessage radioMessage) throws Exception { throw exception.get(); } } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/PragueRadioStation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/PragueRadioStation.java index 1e0e007a0f..ee793a3787 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/PragueRadioStation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/PragueRadioStation.java @@ -22,9 +22,9 @@ public class PragueRadioStation { public static AtomicBoolean observed = new AtomicBoolean(false); - - public void observe(@ObservesAsync RadioMessage radioMessage){ + + public void observe(@ObservesAsync RadioMessage radioMessage) { observed.set(true); } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/RadioMessage.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/RadioMessage.java index 4fef7937c0..d6b7ae3aa4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/RadioMessage.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/async/handlingExceptions/RadioMessage.java @@ -15,7 +15,6 @@ public class RadioMessage { - private String message; public RadioMessage(String message) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/Observer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/Observer.java index 3a554ba7de..20f39ffefd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/Observer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/Observer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/ObserverMethodParameterInjectionValidationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/ObserverMethodParameterInjectionValidationTest.java index 73d94c43d3..8d59e76a1f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/ObserverMethodParameterInjectionValidationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/ambiguous/ObserverMethodParameterInjectionValidationTest.java @@ -31,7 +31,7 @@ /** * Validates that injection points on observer methods are validated. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -44,7 +44,8 @@ public static WebArchive getDeployment() { } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "i"), @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "af") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "i"), + @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "af") }) public void test() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/Observer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/Observer.java index d3843b8b72..f968927aa1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/Observer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/Observer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/ObserverMethodParameterInjectionValidationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/ObserverMethodParameterInjectionValidationTest.java index c6124aef3a..05d867e99b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/ObserverMethodParameterInjectionValidationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/broken/validation/unsatisfied/ObserverMethodParameterInjectionValidationTest.java @@ -31,11 +31,11 @@ /** * Validates that injection points on observer methods are validated. - * + * *

      * This test was originally part of Seam Compatibility project. *

      - * + * * @author Dan Allen * @author Martin Kouba */ @@ -49,7 +49,8 @@ public static WebArchive getDeployment() { } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "i"), @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "i"), + @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "ab") }) public void test() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java index a516c19e0c..b1d9dd9230 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/CheckedExceptionWrappedTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ /** * Tests that a checked exception thrown from a non-transactional observer is wrapped and thrown. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/Tame.java index b196f080e0..15083a438e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/TeaCupPomeranian.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/TeaCupPomeranian.java index caf48ccc6d..64198fbafd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/TeaCupPomeranian.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/checkedException/TeaCupPomeranian.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalEvent.java index 5dea3f9343..b1fb7e63eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalObserverTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalObserverTest.java index e94bb6bcca..33b562abf9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalObserverTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/ConditionalObserverTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -53,7 +53,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "baa"), @SpecAssertion(section = CONDITIONAL_OBSERVER_METHODS, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "baa"), + @SpecAssertion(section = CONDITIONAL_OBSERVER_METHODS, id = "a") }) public void testConditionalObserver() { Event conditionalEvent = getCurrentManager().getEvent().select(ConditionalEvent.class); @@ -126,11 +127,11 @@ public void testAsyncConditionalObserver() throws InterruptedException { asyncConditionalEventEvent.fireAsync(new AsyncConditionalEvent()).thenAccept(queue::offer); AsyncConditionalEvent event = queue.poll(2, TimeUnit.SECONDS); assertFalse(AsyncConditionalObserver.IsNotified().get()); - + AsyncConditionalObserver observer = getContextualReference(AsyncConditionalObserver.class); assertNotNull(observer); observer.ping(); - + asyncConditionalEventEvent.fireAsync(new AsyncConditionalEvent()).thenAccept(queue::offer); event = queue.poll(2, TimeUnit.SECONDS); assertTrue(AsyncConditionalObserver.IsNotified().get()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/RecluseSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/RecluseSpider.java index 87bee501dc..b602f0dd4e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/RecluseSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/RecluseSpider.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * Simple bean that conditionally listens to events. - * + * */ @RequestScoped public class RecluseSpider { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Spun.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Spun.java index 46ec4341e7..59ba8b7f0b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Spun.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Spun.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Tarantula.java index ccce0dbe3d..722ff26baa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Tarantula.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/TarantulaEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/TarantulaEvent.java index 8b05b3826c..4c551f6933 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/TarantulaEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/TarantulaEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Web.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Web.java index 795cb81c40..d53c05c019 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Web.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/conditional/Web.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/AbstractEggObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/AbstractEggObserver.java index 63b660f0e3..32c491ac17 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/AbstractEggObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/AbstractEggObserver.java @@ -21,7 +21,7 @@ /** * @author Martin Kouba - * + * */ public abstract class AbstractEggObserver { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Bar.java index 55c87d76d3..89ffbad2f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Bar.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package org.jboss.cdi.tck.tests.event.observer.inheritance; import jakarta.enterprise.context.Dependent; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Baz.java index 64a2e2cb31..40779c7e42 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Baz.java @@ -21,7 +21,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Baz extends Bar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Egg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Egg.java index 2dd4cdf3c0..b06d782bec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Egg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Egg.java @@ -14,10 +14,9 @@ package org.jboss.cdi.tck.tests.event.observer.inheritance; - /** * @author Martin Kouba - * + * */ public class Egg { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Foo.java index 809233f6f7..f7fe69256f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/Foo.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Foo extends AbstractEggObserver { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/ObserverInheritanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/ObserverInheritanceTest.java index 73a9f75474..403a333c71 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/ObserverInheritanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/ObserverInheritanceTest.java @@ -31,7 +31,7 @@ /** * This test duplicates {@link EventTest#testNonStaticObserverMethodInherited()} and * {@link EventTest#testNonStaticObserverMethodIndirectlyInherited()} but the base class extended is abstract. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -43,7 +43,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "dc"), @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "di") }) + @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "dc"), + @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "di") }) public void testNonStaticObserverMethodInherited() { ActionSequence.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalEvent.java index f2b7328dc4..2722e7122b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalObserver.java index e4d81d6c81..d974b53fe8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ConditionalObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/DisobedientDog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/DisobedientDog.java index 8025141bb0..7b693b3f7d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/DisobedientDog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/DisobedientDog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/EventPayload.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/EventPayload.java index 1d3dc3053e..781e2181c3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/EventPayload.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/EventPayload.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/IntegerObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/IntegerObserver.java index 0f662f44af..997c04ebef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/IntegerObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/IntegerObserver.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class IntegerObserver { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/LargeDog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/LargeDog.java index cfc84a8506..4951119940 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/LargeDog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/LargeDog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 91a8833843..3395415ae0 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 @@ -34,4 +34,3 @@ 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 c8d6d8d5e5..020d80036c 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 @@ -27,7 +27,6 @@ import jakarta.enterprise.event.TransactionPhase; import jakarta.enterprise.inject.spi.Bean; 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; @@ -39,7 +38,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class ObserverMethodTest extends AbstractTest { @@ -132,7 +131,8 @@ public void testInstanceOfBeanForEveryEnabledObserverMethod() { @SpecAssertion(section = OBSERVER_METHOD, id = "f") public void testNotifyOnObserverMethod() { Integer event = Integer.valueOf(1); - Set> observerMethods = getCurrentManager().resolveObserverMethods(event, new Number.Literal()); + 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/method/ShowDog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ShowDog.java index 33a2cadc89..02f6cb00cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ShowDog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/ShowDog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/SmallDog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/SmallDog.java index 8327f2e77b..4b845115ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/SmallDog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/SmallDog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockPrice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockPrice.java index 3c1dabe929..27aaa12d3d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockPrice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockPrice.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.method; - -public class StockPrice extends EventPayload { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.method; + +public class StockPrice extends EventPayload { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockWatcher.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockWatcher.java index 7b2efb814b..32097956ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockWatcher.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/StockWatcher.java @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.method; - -import jakarta.annotation.Priority; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Alternative; - -@Dependent -@Alternative -@Priority(1) -public class StockWatcher { - - private static Class observerClazz; - - public void observeStockPrice(@Observes StockPrice price) { - observerClazz = this.getClass(); - price.recordVisit(this); - } - - public static Class getObserverClazz() { - return observerClazz; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.method; + +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Alternative; + +@Dependent +@Alternative +@Priority(1) +public class StockWatcher { + + private static Class observerClazz; + + public void observeStockPrice(@Observes StockPrice price) { + observerClazz = this.getClass(); + price.recordVisit(this); + } + + public static Class getObserverClazz() { + return observerClazz; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/TransactionalObservers.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/TransactionalObservers.java index 6792e7a254..d81f78dc14 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/TransactionalObservers.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/method/TransactionalObservers.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/EventObserverOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/EventObserverOrderingTest.java index 9de101e01e..eb9a576d65 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/EventObserverOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/EventObserverOrderingTest.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; + import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.spi.ObserverMethod; import jakarta.inject.Inject; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Moonrise.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Moonrise.java index cca1c756a3..342b71e4ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Moonrise.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Moonrise.java @@ -13,7 +13,6 @@ */ package org.jboss.cdi.tck.tests.event.observer.priority; - public class Moonrise extends MoonActivity { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Sunrise.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Sunrise.java index 71e5997069..f85d7e7ff9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Sunrise.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/Sunrise.java @@ -13,7 +13,6 @@ */ package org.jboss.cdi.tck.tests.event.observer.priority; - public class Sunrise { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ApplicationScopedObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ApplicationScopedObserver.java index 871df7068c..02568a2b6d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ApplicationScopedObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ApplicationScopedObserver.java @@ -38,7 +38,8 @@ public static StringBuilder getBuilder() { return builder; } - public void first(@Observes @Initialized(ApplicationScoped.class) @Priority(Interceptor.Priority.APPLICATION - 100) Object obj) { + public void first( + @Observes @Initialized(ApplicationScoped.class) @Priority(Interceptor.Priority.APPLICATION - 100) Object obj) { getBuilder().append(A); } @@ -46,11 +47,13 @@ public void second(@Observes @Initialized(ApplicationScoped.class) Object obj) { getBuilder().append(B); } - public void third(@Observes @Initialized(ApplicationScoped.class) @Priority(Interceptor.Priority.APPLICATION + 600) Object obj) { + public void third( + @Observes @Initialized(ApplicationScoped.class) @Priority(Interceptor.Priority.APPLICATION + 600) Object obj) { getBuilder().append(C); } - public void forth(@Observes @Initialized(ApplicationScoped.class) @Priority(Interceptor.Priority.APPLICATION + 700) Object obj) { + public void forth( + @Observes @Initialized(ApplicationScoped.class) @Priority(Interceptor.Priority.APPLICATION + 700) Object obj) { getBuilder().append(D); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/AirConditioner.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/AirConditioner.java index 8c0728d2a0..76575d3f3d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/AirConditioner.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/AirConditioner.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BatteryEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BatteryEvent.java index 69e3542975..bab01fc18d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BatteryEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BatteryEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BullTerrier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BullTerrier.java index 44171fc051..26ac92b632 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BullTerrier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/BullTerrier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Cloud.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Cloud.java index 2e561d4855..5b91e66836 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Cloud.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Cloud.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DisabledObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DisabledObserver.java index 5f36bd74ae..d293f0a4d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DisabledObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DisabledObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DiskSpaceEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DiskSpaceEvent.java index e37eccb373..feb66c0e17 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DiskSpaceEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/DiskSpaceEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Ghost.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Ghost.java index a01d1bcbad..a8d2972541 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Ghost.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Ghost.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/MultiBindingEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/MultiBindingEvent.java index 3a0cee5420..5a702b9df5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/MultiBindingEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/MultiBindingEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/NotEnabled.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/NotEnabled.java index 6c7e8e6518..34a53b39d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/NotEnabled.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/NotEnabled.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Pomeranian.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Pomeranian.java index 7fc7c9f313..805d364fee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Pomeranian.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Pomeranian.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/PriviledgedObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/PriviledgedObserver.java index 89abaf866c..30be092e12 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/PriviledgedObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/PriviledgedObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 32e9c118c9..795201ebcb 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -93,11 +93,14 @@ public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTyp } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "c"), @SpecAssertion(section = EVENT_QUALIFIER_TYPES_WITH_MEMBERS, id = "a"), + @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "c"), + @SpecAssertion(section = EVENT_QUALIFIER_TYPES_WITH_MEMBERS, id = "a"), @SpecAssertion(section = MULTIPLE_EVENT_QUALIFIERS, id = "a") }) public void testObserverMethodMayHaveMultipleBindingTypes() { // If we can resolve the observer with the two binding types, then it worked - assertEquals(getCurrentManager().resolveObserverMethods(new MultiBindingEvent(), new RoleBinding("Admin"), new TameAnnotationLiteral()).size(), 2); + assertEquals(getCurrentManager() + .resolveObserverMethods(new MultiBindingEvent(), new RoleBinding("Admin"), new TameAnnotationLiteral()).size(), + 2); } @Test @@ -110,9 +113,11 @@ public void testObserverMethodRegistration() { @Test @SpecAssertions({ // these two assertions combine to create a logical, testable assertion - @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "a"), @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "b") }) + @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "a"), + @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "b") }) public void testBeanManagerResolveObserversSignature() throws Exception { - assertNotNull(getCurrentManager().getClass().getDeclaredMethod(BEAN_MANAGER_RESOLVE_OBSERVERS_METHOD_NAME, Object.class, Annotation[].class)); + assertNotNull(getCurrentManager().getClass().getDeclaredMethod(BEAN_MANAGER_RESOLVE_OBSERVERS_METHOD_NAME, Object.class, + Annotation[].class)); } @Test(expectedExceptions = { IllegalArgumentException.class }) @@ -145,7 +150,8 @@ public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans() { @Test @SpecAssertion(section = OBSERVES, id = "ab") public void testSyncObserver() { - Set> diskSpaceObservers = getCurrentManager().resolveObserverMethods(new DiskSpaceEvent()); + Set> diskSpaceObservers = getCurrentManager() + .resolveObserverMethods(new DiskSpaceEvent()); assertTrue(diskSpaceObservers.stream().allMatch(method -> !method.isAsync())); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Role.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Role.java index 4f2f76a985..ca5e560042 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Role.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Role.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.resolve; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -@Qualifier -public @interface Role { - String value(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.resolve; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +@Qualifier +public @interface Role { + String value(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/RoleBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/RoleBinding.java index 77d28e0174..cd3a401fab 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/RoleBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/RoleBinding.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.resolve; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class RoleBinding extends AnnotationLiteral implements Role { - private String value = null; - - public RoleBinding(String value) { - this.value = value; - } - - public String value() { - return value; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.resolve; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class RoleBinding extends AnnotationLiteral implements Role { + private String value = null; + + public RoleBinding(String value) { + this.value = value; + } + + public String value() { + return value; + } + +} 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 9d515f3b2d..30cf16fd2b 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SimpleEventType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SimpleEventType.java index 17a4515a5a..89f72f91fe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SimpleEventType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SimpleEventType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SystemMonitor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SystemMonitor.java index 2a49c60a13..535d4ac440 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SystemMonitor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/SystemMonitor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,9 +24,8 @@ public void lowBattery(@Observes BatteryEvent e) { public void lowDiskSpace(@Observes DiskSpaceEvent e) { } - - public void newUserAdded(@ObservesAsync User u){ + + public void newUserAdded(@ObservesAsync User u) { } - - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Tame.java index a6aa487df9..12966f1987 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/TameAnnotationLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/TameAnnotationLiteral.java index 4b51861b39..1c19146ed2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/TameAnnotationLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/TameAnnotationLiteral.java @@ -1,20 +1,20 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.resolve; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class TameAnnotationLiteral extends AnnotationLiteral implements Tame { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.resolve; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class TameAnnotationLiteral extends AnnotationLiteral implements Tame { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Temperature.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Temperature.java index fc8f0d32d5..dfbdbb7a0f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Temperature.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Temperature.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Thermostat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Thermostat.java index f3e34edb93..af2db4da2b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Thermostat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/Thermostat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java index f326606c96..b45a28995b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/ObserverExceptionRethrownTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ /** * Tests that an unchecked exception thrown from a non-transactional observer is rethrown. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/TeaCupPomeranian.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/TeaCupPomeranian.java index e8e0243f97..58a70e7d1f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/TeaCupPomeranian.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/runtimeException/TeaCupPomeranian.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,7 +23,8 @@ public static class OversizedException extends RuntimeException { private static final long serialVersionUID = 1L; } - static class Trigger {}; + static class Trigger { + }; public void observeSimpleEvent(@Observes Trigger someEvent) { throw new OversizedException(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java index 819f1ee6ec..c3e9b93b01 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Behavior { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java index 7b3168406b..d0410fd483 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java @@ -20,6 +20,7 @@ import java.util.List; import jakarta.enterprise.util.TypeLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/EventObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/EventObserver.java index f718964509..36c975003d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/EventObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/EventObserver.java @@ -53,8 +53,8 @@ public void observeCharacterList(@Observes List event) { this.characterListObserved = true; } - public void observeIntegerFoo(@Observes Foo event){ - this.integerFooObserved = true; + public void observeIntegerFoo(@Observes Foo event) { + this.integerFooObserved = true; } public boolean isStringListFooableObserved() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/IntegerListObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/IntegerListObserver.java index ae899916e4..6d776e16eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/IntegerListObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/IntegerListObserver.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.tests.event.parameterized; -import jakarta.enterprise.context.ApplicationScoped; - import java.util.List; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class IntegerListObserver extends AbstractParameterizedObserver> { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/ParameterizedEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/ParameterizedEventTest.java index d2e3f9ba86..f7c40d1fe6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/ParameterizedEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/ParameterizedEventTest.java @@ -41,10 +41,10 @@ /** * Test that verifies that the container uses the runtime type of the event object as the event type. If the event type contains * an unresolved type variable the selected type is used to resolve it. - * - * + * + * * This test was originally part of the Weld test suite. - * + * * * @author Jozef Hartinger * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/StringListObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/StringListObserver.java index 9bf0e29467..5423d870f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/StringListObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/parameterized/StringListObserver.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.tests.event.parameterized; -import jakarta.enterprise.context.ApplicationScoped; - import java.util.List; +import jakarta.enterprise.context.ApplicationScoped; + @ApplicationScoped public class StringListObserver extends AbstractParameterizedObserver> { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeA.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeA.java index b13635d980..a460c380b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeA.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeA.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeABinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeABinding.java index 1337ad9493..408770a22e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeABinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeABinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,11 +19,11 @@ public class BindingTypeABinding extends AnnotationLiteral impleme private String value; - public BindingTypeABinding(String value){ - this.value=value; + public BindingTypeABinding(String value) { + this.value = value; } - public String value(){ + public String value() { return value; } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeB.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeB.java index c1685b05af..3e7605fcb1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeB.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeB.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeBBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeBBinding.java index b7a021081a..04b3a12177 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeBBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeBBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeC.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeC.java index 2480886974..524cd465e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeC.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeC.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeCBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeCBinding.java index 2c1c5249ed..87724eee29 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeCBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/BindingTypeCBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java index 9b2cdd5f11..ff22c4e6e4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -49,6 +49,7 @@ public void observer(@Observes AnEventType event) { @Test(expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "d") public void testDuplicateBindingTypesWhenResolvingFails() { - getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeABinding("a1"), new BindingTypeABinding("a2")); + getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeABinding("a1"), + new BindingTypeABinding("a2")); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java index 2e7a826812..30b947515a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -58,11 +58,15 @@ public void observer(@Observes @BindingTypeC("second-observer") AnEventType even } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVER_METHOD_EVENT_PARAMETER, id = "a"), @SpecAssertion(section = EVENT_QUALIFIER_TYPES_WITH_MEMBERS, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVER_METHOD_EVENT_PARAMETER, id = "a"), + @SpecAssertion(section = EVENT_QUALIFIER_TYPES_WITH_MEMBERS, id = "a") }) public void testResolvingChecksBindingTypeMembers() { - assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("first-observer")).size() == 1; - assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("second-observer")).size() == 1; - assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("third-observer")).size() == 0; + assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("first-observer")) + .size() == 1; + assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("second-observer")) + .size() == 1; + assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("third-observer")) + .size() == 0; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotype.java index 64f3972879..469efedf06 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java index 7d0a967c50..fa1cd3e06d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java index 56ff3752da..19385670c3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Box.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Box.java index 07ff86d8de..a42dced1d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Box.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Box.java @@ -13,6 +13,6 @@ */ package org.jboss.cdi.tck.tests.event.resolve.typeWithParameters; -public class Box { +public class Box { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java index 567f5fe4c3..1cbf61bbe1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,17 +21,19 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; +import java.util.Set; + import jakarta.enterprise.context.Dependent; import jakarta.enterprise.event.Event; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.ObserverMethod; import jakarta.enterprise.util.TypeLiteral; import jakarta.inject.Inject; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import java.util.Set; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -54,7 +56,8 @@ public static WebArchive createTestArchive() { Event> event; @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVERS_ASSIGNABILITY, id = "b"), @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVERS_ASSIGNABILITY, id = "b"), + @SpecAssertion(section = BM_OBSERVER_METHOD_RESOLUTION, id = "a") }) public void testResolvingChecksTypeParameters() { verifyObserver(new StringList(), 1, StringListObserver.class); verifyObserver(new IntegerList(), 1, IntegerListObserver.class); @@ -72,7 +75,8 @@ public void testParameterizedEventTypeAssignableToRawType() { } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVERS_ASSIGNABILITY, id = "c"), @SpecAssertion(section = OBSERVER_METHODS, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVERS_ASSIGNABILITY, id = "c"), + @SpecAssertion(section = OBSERVER_METHODS, id = "ab") }) public void testObservedEventTypeParameterIsActualType() { ActionSequence.reset(); Foo fooString = new Foo.FooString(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java index 3e96194057..f0c09ae304 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Foo.java index 7aaf6b25ce..ae668c0211 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/FooObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/FooObserver.java index 8a91e19520..ffbaf691b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/FooObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/FooObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/RawTypeObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/RawTypeObserver.java index 2f5fdaa9a3..46e9d34a44 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/RawTypeObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/RawTypeObserver.java @@ -25,7 +25,7 @@ public class RawTypeObserver { @SuppressWarnings("rawtypes") // raw type used intentionally public void observe(@Observes Box box) { - OBSERVED = true; + OBSERVED = true; } protected static class BoxWithObjectTypeParameters extends Box { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/UnusedEventType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/UnusedEventType.java index 40c7220329..09d607ddfa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/UnusedEventType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/resolve/typeWithParameters/UnusedEventType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/AlarmSystem.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/AlarmSystem.java index 5703282f43..9acd816fd5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/AlarmSystem.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/AlarmSystem.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/BreakInEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/BreakInEvent.java index cee11df9ef..84449f7746 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/BreakInEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/BreakInEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 9bff6904fd..82047f0e41 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 @@ -6,15 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.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; @@ -25,6 +23,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent.java index cbcf29ad90..f61f663d65 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent_Illegal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent_Illegal.java index 113f64cabc..885e842d00 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent_Illegal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecurityEvent_Illegal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecuritySensor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecuritySensor.java index 3b68d4aa55..fa1ae1a9ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecuritySensor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SecuritySensor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 ce13e2b935..9bc058e3a4 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,6 @@ import static org.jboss.cdi.tck.cdi.Sections.EVENT; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.TypeLiteral; import org.jboss.arquillian.container.test.api.Deployment; @@ -28,7 +27,7 @@ /** * These tests verify the behavior of the Event#select() method. - * + * * @author Dan Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SystemTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SystemTest.java index 0b84ebfead..f451114918 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SystemTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/event/select/SystemTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,11 +38,11 @@ public static class SystemTestLiteral extends AnnotationLiteral impl private String value; - public SystemTestLiteral(String value){ - this.value=value; + public SystemTestLiteral(String value) { + this.value = value; } - public String value(){ + public String value() { return value; } } 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 1edf5528e4..b770b5f8f0 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 3f6c1fdcc5..97d1e90391 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 @@ -27,8 +27,13 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Type; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -38,10 +43,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.HashSet; -import java.util.Set; - @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) public class AlternativeAvailabilityTest extends AbstractTest { @@ -52,7 +53,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(AlternativeAvailabilityTest.class) .withBeansXml( new BeansXml().alternatives(Chicken.class, EnabledSheepProducer.class, SnakeProducer.class) - .stereotype(EnabledAlternativeStereotype.class)).build(); + .stereotype(EnabledAlternativeStereotype.class)) + .build(); } @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Animal.java index f57bf5567e..387bab35b0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Bird.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Bird.java index dde07e8817..f67275d3fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Bird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Bird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/BirdProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/BirdProducer.java index c08a90e86e..36a3934407 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/BirdProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/BirdProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Cat.java index 98adbbd921..b0b19dbc8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/CatProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/CatProducer.java index 5c704150a3..99b227d471 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/CatProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/CatProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Chicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Chicken.java index f2711e9f2c..7976bc4bed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Chicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Chicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Dog.java index 8613dd02ad..18fc5cb829 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledAlternativeStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledAlternativeStereotype.java index 714750a215..ca04fc5f49 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledAlternativeStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledAlternativeStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,13 +18,13 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Alternative; import jakarta.enterprise.inject.Stereotype; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - @RequestScoped @Stereotype @Alternative diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledSheepProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledSheepProducer.java index 22c9f33728..da505923f3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledSheepProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/EnabledSheepProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Horse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Horse.java index 9a418bdfe7..0596269d1b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Horse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledAlternativeStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledAlternativeStereotype.java index 92f39acb40..51f4af2813 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledAlternativeStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledAlternativeStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,13 +18,13 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Alternative; import jakarta.enterprise.inject.Stereotype; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - @RequestScoped @Stereotype @Alternative diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledSheepProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledSheepProducer.java index b9b793b0d4..2fe73ff15d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledSheepProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/NotEnabledSheepProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Sheep.java index 8bd4b875ce..24ca2eaf08 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/SnakeProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/SnakeProducer.java index 757baeea0d..045798783a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/SnakeProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/SnakeProducer.java @@ -24,11 +24,10 @@ public class SnakeProducer { @Wild Snake snake = new Snake(); - @Produces @Alternative @Wild - public Snake produceWildSnake(){ + public Snake produceWildSnake() { return snake; } 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 3933cee8c4..62992ca6b6 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,12 +19,12 @@ 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; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier 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 8f3664547b..061d2b1926 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,12 +19,12 @@ 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; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java index b02029f755..08020db3c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/NoClassWithSpecifiedNameTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.EXCEPTIONS; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java index a10e9fd0d7..9284e6ac52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/incorrect/name/stereotype/NoAnnotationWithSpecifiedNameTest.java @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/Cat.java index 544226630c..21201c4e22 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java index 3a98c6e130..aa73cb48d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/ClassIsNotAlternativeTest.java @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/stereotype/Mock.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/stereotype/Mock.java index 403657980d..f9cdb46054 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/stereotype/Mock.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/not/alternative/stereotype/Mock.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Cat.java index 675fa43628..7b781fa527 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Dog.java index 4aeb6ddc6d..f312eb0663 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/broken/same/type/twice/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java index dd05e590ca..2344dc72ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/SelectedBeanWithUnselectedStereotypeTest.java @@ -17,8 +17,11 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import static org.testng.Assert.assertEquals; +import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; @@ -29,8 +32,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - /** * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/UnselectedStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/UnselectedStereotype.java index 6f810b3b9c..a1f1849c3b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/UnselectedStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/selection/stereotype/UnselectedStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerProducer.java index 9143fab941..0d3ce85bb7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerProducer.java @@ -21,7 +21,7 @@ public class AlternativeConsumerProducer { @Produces @AlternativeConsumerStereotype - public Consumer createAlternativeConsumer(){ - return new Consumer(); + public Consumer createAlternativeConsumer() { + return new Consumer(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerStereotype.java index e4ee4d0a39..0a1418a0c3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/AlternativeConsumerStereotype.java @@ -17,6 +17,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Alternative; import jakarta.enterprise.inject.Stereotype; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/VetoedAlternativeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/VetoedAlternativeTest.java index 253ac1254b..09be75afbb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/VetoedAlternativeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/alternative/veto/VetoedAlternativeTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE; import jakarta.enterprise.context.RequestScoped; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AfterBeanDiscoveryObserver.java index 72e2c05de3..2ce12d9b9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AnotherSessionBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AnotherSessionBean.java index fa82b5f1f7..dd5307e445 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AnotherSessionBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/AnotherSessionBean.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.context; -import jakarta.enterprise.context.SessionScoped; - import java.io.Serializable; +import jakarta.enterprise.context.SessionScoped; + @SessionScoped class AnotherSessionBean implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextDestroysBeansTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextDestroysBeansTest.java index dcb1810074..eebe5c4898 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextDestroysBeansTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextDestroysBeansTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author Pete Muir * @author David Allen diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextTest.java index 30ac36dd3c..befb72d20e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/ContextTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContext2Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContext2Test.java index d6a4de164c..8db42c68ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContext2Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContext2Test.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author Pete Muir * @author David Allen diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContextTest.java index cc3cc3c26c..9128367bee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyForSameCreationalContextTest.java @@ -18,6 +18,7 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; @@ -29,7 +30,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author Pete Muir * @author David Allen diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyedInstanceReturnedByGetTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyedInstanceReturnedByGetTest.java index 7b13031567..fcdf111974 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyedInstanceReturnedByGetTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DestroyedInstanceReturnedByGetTest.java @@ -20,6 +20,7 @@ import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DummyContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DummyContext.java index 6bb79df77d..6585669c7c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DummyContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/DummyContext.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetFromContextualTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetFromContextualTest.java index c733e776e3..cdd3454eca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetFromContextualTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetFromContextualTest.java @@ -18,6 +18,7 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetOnInactiveContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetOnInactiveContextTest.java index 3f47dfba3c..1d76b4e8f2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetOnInactiveContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetOnInactiveContextTest.java @@ -19,6 +19,7 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.Contextual; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetWithNoCreationalContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetWithNoCreationalContextTest.java index a609eecf85..5ae621efa9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetWithNoCreationalContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/GetWithNoCreationalContextTest.java @@ -17,6 +17,7 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.Contextual; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MyContextual.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MyContextual.java index 205fce22f8..226d8a361d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MyContextual.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MyContextual.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MySessionBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MySessionBean.java index dc51ed2674..bb8d757813 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MySessionBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/MySessionBean.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.context; -import jakarta.enterprise.context.SessionScoped; - import java.io.Serializable; +import jakarta.enterprise.context.SessionScoped; + @SessionScoped public class MySessionBean implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/NormalContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/NormalContextTest.java index f3b07e7e98..bd8fba2bdc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/NormalContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/NormalContextTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author Pete Muir * @author David Allen diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanA.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanA.java index 73fd57c80b..6c758f9ad9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanA.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanA.java @@ -6,18 +6,18 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.context; +import java.io.Serializable; + import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Inject; -import java.io.Serializable; - @SessionScoped public class SimpleBeanA implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanB.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanB.java index 8fd8e5be51..b4fd622700 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanB.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanB.java @@ -6,18 +6,18 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.context; +import java.io.Serializable; + import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Inject; -import java.io.Serializable; - @SessionScoped public class SimpleBeanB implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanZ.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanZ.java index 65339d4d70..f2a6ffbc50 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanZ.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/SimpleBeanZ.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.context; -import jakarta.enterprise.context.SessionScoped; - import java.io.Serializable; +import jakarta.enterprise.context.SessionScoped; + @SessionScoped public class SimpleBeanZ implements Serializable { private static final long serialVersionUID = 1L; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/Unregistered.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/Unregistered.java index 3020d72d54..ef58f56e95 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/Unregistered.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/Unregistered.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/AlterableContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/AlterableContextTest.java index ce66692a8b..61b96813f2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/AlterableContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/AlterableContextTest.java @@ -21,6 +21,7 @@ import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -33,11 +34,11 @@ /** * Tests for https://issues.jboss.org/browse/CDI-139 - * + * *

      * This test was originally part of the Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomContext.java index 2db8623af5..ee01587151 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomContext.java @@ -15,15 +15,15 @@ import static org.testng.Assert.assertTrue; -import jakarta.enterprise.context.spi.AlterableContext; -import jakarta.enterprise.context.spi.Contextual; -import jakarta.enterprise.context.spi.CreationalContext; - import java.io.Serializable; import java.lang.annotation.Annotation; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import jakarta.enterprise.context.spi.AlterableContext; +import jakarta.enterprise.context.spi.Contextual; +import jakarta.enterprise.context.spi.CreationalContext; + public class CustomContext implements AlterableContext { private static class Instance { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomScoped.java index 68fcd317b3..16c32cb8e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/alterable/CustomScoped.java @@ -18,12 +18,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.NormalScope; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.context.NormalScope; + @NormalScope(passivating = true) @Inherited @Target({ TYPE, METHOD, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/DependentContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/DependentContextTest.java index 2f975950d9..31f97a12ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/DependentContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/DependentContextTest.java @@ -13,9 +13,14 @@ */ package org.jboss.cdi.tck.tests.full.context.dependent; +import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_CONTEXT; +import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_CONTEXT_EE; +import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_DESTRUCTION_EE; + import java.util.Set; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.TestGroups; @@ -25,10 +30,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_CONTEXT; -import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_CONTEXT_EE; -import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_DESTRUCTION_EE; - @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = TestGroups.CDI_FULL) public class DependentContextTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Fox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Fox.java index 2f5140be14..e613b140a6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Fox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Fox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxProducer.java index 0588f9ce1c..71952bbbb5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxRun.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxRun.java index b781a57e97..fa276a9a64 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxRun.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/FoxRun.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Pet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Pet.java index f8f6e486db..7451805ba9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Pet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/Pet.java @@ -6,25 +6,25 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.context.dependent; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/SensitiveFox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/SensitiveFox.java index 9c3218b1a9..a921865a51 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/SensitiveFox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/dependent/SensitiveFox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Big.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Big.java index accd4264de..6a2ddbc6db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Big.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Big.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/City.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/City.java index 0de1237a7f..39b3fc40b3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/City.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/City.java @@ -1,20 +1,20 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -public class City { - public void ping() { - - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +public class City { + public void ping() { + + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityBinding.java index e7f1bd9889..215cf91fc7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityBinding.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.InterceptorBinding; - -@InterceptorBinding -@Dependent -@Target({ TYPE, METHOD }) -@Retention(RUNTIME) -public @interface CityBinding { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.Dependent; +import jakarta.interceptor.InterceptorBinding; + +@InterceptorBinding +@Dependent +@Target({ TYPE, METHOD }) +@Retention(RUNTIME) +public @interface CityBinding { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer.java index 3517fa3132..7b60ca6467 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.SessionScoped; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class CityProducer { - @Produces - public Violation reference = new Violation(); - - @Produces - @SessionScoped - public HelsinkiNonSerializable helsinki = new HelsinkiNonSerializable(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class CityProducer { + @Produces + public Violation reference = new Violation(); + + @Produces + @SessionScoped + public HelsinkiNonSerializable helsinki = new HelsinkiNonSerializable(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer2.java index b195321686..a40cd42101 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/CityProducer2.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class CityProducer2 { - @Produces - @Big - public Violation create() { - return new Violation(); - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class CityProducer2 { + @Produces + @Big + public Violation create() { + return new Violation(); + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Generator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Generator.java index 8760b7665f..a89baa80dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Generator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Generator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/HelsinkiNonSerializable.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/HelsinkiNonSerializable.java index f9c01db0c5..08e2e1823e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/HelsinkiNonSerializable.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/HelsinkiNonSerializable.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import jakarta.enterprise.inject.Alternative; - -@Alternative -public class HelsinkiNonSerializable { - - public void ping() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import jakarta.enterprise.inject.Alternative; + +@Alternative +public class HelsinkiNonSerializable { + + public void ping() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Hyvinkaa.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Hyvinkaa.java index 98f1d9335a..2cf58da7e1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Hyvinkaa.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Hyvinkaa.java @@ -1,27 +1,27 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SuppressWarnings("serial") -@SessionScoped -public class Hyvinkaa implements Serializable { - @SuppressWarnings("unused") - @Inject - private transient Violation reference; -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SuppressWarnings("serial") +@SessionScoped +public class Hyvinkaa implements Serializable { + @SuppressWarnings("unused") + @Inject + private transient Violation reference; +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Joensuu.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Joensuu.java index 2e43e80002..af550b031b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Joensuu.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Joensuu.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SuppressWarnings("serial") -@SessionScoped -public class Joensuu implements Serializable { - @SuppressWarnings("unused") - @Inject - private transient Violation reference; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SuppressWarnings("serial") +@SessionScoped +public class Joensuu implements Serializable { + @SuppressWarnings("unused") + @Inject + private transient Violation reference; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Jyvaskyla.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Jyvaskyla.java index 50f7b298e4..a2b7f537a2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Jyvaskyla.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Jyvaskyla.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; - -@SuppressWarnings("serial") -@SessionScoped -public class Jyvaskyla implements Serializable { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; + +@SuppressWarnings("serial") +@SessionScoped +public class Jyvaskyla implements Serializable { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Kajaani.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Kajaani.java index 2ec059af2c..9c8d95d253 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Kajaani.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Kajaani.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/NumberConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/NumberConsumer.java index 62b0a375cc..9181701c1f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/NumberConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/NumberConsumer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/PassivatingContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/PassivatingContextTest.java index 97f6cf1613..5513e12d5d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/PassivatingContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/PassivatingContextTest.java @@ -41,7 +41,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author David Allen * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Record.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Record.java index 3f45f18278..d3ec0af225 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Record.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Record.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/RecordProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/RecordProducer.java index ad76e14251..13a04b0820 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/RecordProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/RecordProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,7 @@ @Dependent public class RecordProducer { - public @Produces - @SessionScoped - Record getRecord() { + public @Produces @SessionScoped Record getRecord() { return new Record(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Salo_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Salo_Broken.java index d5fcc6ae40..11639bc4b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Salo_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Salo_Broken.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SessionScoped -public class Salo_Broken extends City implements Serializable { - private static final long serialVersionUID = 5500591077418621816L; - - @SuppressWarnings("unused") - @Inject - private transient Violation reference; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SessionScoped +public class Salo_Broken extends City implements Serializable { + private static final long serialVersionUID = 5500591077418621816L; + + @SuppressWarnings("unused") + @Inject + private transient Violation reference; + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCity.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCity.java index 9e3222d931..fbaefd07a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCity.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCity.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ public class SerializableCity extends City implements Serializable { /** - * - */ + * + */ private static final long serialVersionUID = -1178747162008489924L; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCityConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCityConsumer.java index 411427ccd6..9fa15eacc1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCityConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/SerializableCityConsumer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sleeping.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sleeping.java index 8d9643194c..8b34199259 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sleeping.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sleeping.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sysma.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sysma.java index 33a5667cd1..36ece765c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sysma.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Sysma.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,9 +15,9 @@ /** * Simple bean that is not serializable. - * + * * @author David Allen - * + * */ public class Sysma { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Television.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Television.java index 8de9d371fa..1a9f331448 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Television.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Television.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/TelevisionProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/TelevisionProducer.java index e063060420..3df392d529 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/TelevisionProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/TelevisionProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Violation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Violation.java index a8ca108b6a..9e47f6daf9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Violation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Violation.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating; - -import jakarta.enterprise.inject.Alternative; - -@Alternative -public class Violation { - public void ping() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating; + +import jakarta.enterprise.inject.Alternative; + +@Alternative +public class Violation { + public void ping() { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Wheat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Wheat.java index 8b01deb512..d113947b03 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Wheat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/Wheat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/WheatProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/WheatProducer.java index 1255d509ce..e2a0abd51c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/WheatProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/WheatProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,5 @@ @Dependent public class WheatProducer { - public @Produces - @SessionScoped - Wheat wheat = new Wheat(); + public @Produces @SessionScoped Wheat wheat = new Wheat(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/Hamina_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/Hamina_Broken.java index 443da2ae08..a15367be5a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/Hamina_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/Hamina_Broken.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken; - -import jakarta.enterprise.context.SessionScoped; - -@SessionScoped -public class Hamina_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken; + +import jakarta.enterprise.context.SessionScoped; + +@SessionScoped +public class Hamina_Broken { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/NonPassivationManagedBeanHasPassivatingScopeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/NonPassivationManagedBeanHasPassivatingScopeTest.java index 88bf1c92f2..09fcda6eec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/NonPassivationManagedBeanHasPassivatingScopeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/NonPassivationManagedBeanHasPassivatingScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author David Allen * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Vantaa_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Vantaa_Broken.java index d0ba07efca..4d5ee30c6d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Vantaa_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Vantaa_Broken.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.constructor; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SuppressWarnings("serial") -@SessionScoped -public class Vantaa_Broken implements Serializable { - - @Inject - public Vantaa_Broken(Violation violation) { - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.constructor; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SuppressWarnings("serial") +@SessionScoped +public class Vantaa_Broken implements Serializable { + + @Inject + public Vantaa_Broken(Violation violation) { + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Violation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Violation.java index d907d19e59..3341e19065 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Violation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/constructor/Violation.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.constructor; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Violation { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.constructor; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Violation { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/MaarianhaminaDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/MaarianhaminaDecorator.java index dec8c0edf5..322b53c76a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/MaarianhaminaDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/MaarianhaminaDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/Maarianhamina_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/Maarianhamina_Broken.java index a12494e088..bddf268126 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/Maarianhamina_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/Maarianhamina_Broken.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.decorator; - -import jakarta.enterprise.context.SessionScoped; - -@SessionScoped -public class Maarianhamina_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.decorator; + +import jakarta.enterprise.context.SessionScoped; + +@SessionScoped +public class Maarianhamina_Broken { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java index 478db4ec8d..2334759e48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/ManagedBeanWithNonPassivatingDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityDecorator.java index 67b47c9bfc..28727029c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityInterface.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityInterface.java index 51bd82f34f..7c5c82b6c0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityInterface.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/CityInterface.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.decorator.field; - -public interface CityInterface { - public void foo(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.decorator.field; + +public interface CityInterface { + public void foo(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java index c25a030e98..e659f93904 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/DecoratorWithNonPassivatingInjectedFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/NonPassivating.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/NonPassivating.java index 0d49735661..7b5d6d74ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/NonPassivating.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/NonPassivating.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/UnderwaterCity.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/UnderwaterCity.java index eacac3ee9d..356d2112a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/UnderwaterCity.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/decorator/field/UnderwaterCity.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Vantaa_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Vantaa_Broken.java index 0e6651847f..c5bb52d44b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Vantaa_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Vantaa_Broken.java @@ -1,40 +1,40 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.field; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SessionScoped -public class Vantaa_Broken implements Serializable { - private static final long serialVersionUID = -1686562136639336613L; - - @Inject - private Violation reference; - - public Violation getReference() { - return reference; - } - - public void setReference(Violation reference) { - this.reference = reference; - } - - public String test() { - return reference.toString(); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.field; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SessionScoped +public class Vantaa_Broken implements Serializable { + private static final long serialVersionUID = -1686562136639336613L; + + @Inject + private Violation reference; + + public Violation getReference() { + return reference; + } + + public void setReference(Violation reference) { + this.reference = reference; + } + + public String test() { + return reference.toString(); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Violation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Violation.java index a43ebf611d..dcb9a354cb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Violation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/field/Violation.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.field; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Violation { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.field; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Violation { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Vantaa_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Vantaa_Broken.java index 3b12435fb8..77084f4c38 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Vantaa_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Vantaa_Broken.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.initializer; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SuppressWarnings("serial") -@SessionScoped -public class Vantaa_Broken implements Serializable { - - @Inject - public void setViolation(Violation violation) { - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.initializer; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SuppressWarnings("serial") +@SessionScoped +public class Vantaa_Broken implements Serializable { + + @Inject + public void setViolation(Violation violation) { + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Violation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Violation.java index 22c7e53e6f..109f251571 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Violation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/initializer/Violation.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.initializer; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Violation { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.initializer; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Violation { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Interceptor_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Interceptor_Broken.java index e5744762f5..606dcd63b0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Interceptor_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Interceptor_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Kokkola_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Kokkola_Broken.java index f0130f928e..1fdd428d91 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Kokkola_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/Kokkola_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/ManagedBeanWithNonSerializableInterceptorClassTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/ManagedBeanWithNonSerializableInterceptorClassTest.java index 80e9b75f09..e305a47786 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/ManagedBeanWithNonSerializableInterceptorClassTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/ManagedBeanWithNonSerializableInterceptorClassTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBean.java index 8669092fe1..e18374ec65 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBinding.java index e67787706f..50ae3577ea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BakedBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BrokenInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BrokenInterceptor.java index 015f094129..3b66c0b70e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BrokenInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/BrokenInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/InterceptorType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/InterceptorType.java index 1f7a6ca11d..7984a479b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/InterceptorType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/InterceptorType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java index 4d21cb8aad..10cbf47fbf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/PassivationCapableBeanWithNonPassivatingInterceptorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/Violation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/Violation.java index 059aff9a72..47b2c7afef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/Violation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/Violation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/ViolationProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/ViolationProducer.java index 6665c5eeee..74c30dca5a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/ViolationProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/interceptor/field/ViolationProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,8 +16,7 @@ import jakarta.enterprise.inject.Produces; public class ViolationProducer { - public final @Produces - Violation getViolation() { + public final @Produces Violation getViolation() { return new Violation(null); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/Broken_Record.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/Broken_Record.java index 0109e3f032..5037436d7d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/Broken_Record.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/Broken_Record.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/FooScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/FooScoped.java index c9a8051f42..84b9164a83 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/FooScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/FooScoped.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/NonPassivationCapableProducerFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/NonPassivationCapableProducerFieldTest.java index a019aab378..18dcfbb205 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/NonPassivationCapableProducerFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/NonPassivationCapableProducerFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,7 @@ import org.testng.annotations.Test; /** - * + * * @author Shane Bryzak */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/RecordProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/RecordProducer.java index 56430d948d..f72dbd38d6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/RecordProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/RecordProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,5 @@ @Dependent public class RecordProducer { - public @Produces - @FooScoped - Broken_Record record = new Broken_Record(); + public @Produces @FooScoped Broken_Record record = new Broken_Record(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/British.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/British.java index 8afcb2f9e6..7ac9303535 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/British.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/British.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.field.managed.dependent; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Qualifier -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -public @interface British { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.field.managed.dependent; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Qualifier +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +public @interface British { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ConstructorInjectionCorralBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ConstructorInjectionCorralBroken.java index b06a78fff2..5bce2d6d8a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ConstructorInjectionCorralBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ConstructorInjectionCorralBroken.java @@ -21,14 +21,15 @@ public class ConstructorInjectionCorralBroken extends Corral { private Cow cow; - public ConstructorInjectionCorralBroken(){} + public ConstructorInjectionCorralBroken() { + } @Inject - public ConstructorInjectionCorralBroken(@British Cow cow){ - this.cow = cow; + public ConstructorInjectionCorralBroken(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Corral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Corral.java index 0cedece918..b261c1131b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Corral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Corral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,6 +19,4 @@ public abstract class Corral implements Serializable { public abstract void ping(); - - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Cow.java index 07d91bad8a..00126fd5c9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/CowProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/CowProducer.java index 0a6355d0f0..63b70c669c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/CowProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/CowProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/FieldInjectionCorralBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/FieldInjectionCorralBroken.java index 9d5a531d2c..8da441d02f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/FieldInjectionCorralBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/FieldInjectionCorralBroken.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.field.managed.dependent; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SuppressWarnings("serial") -@SessionScoped -public class FieldInjectionCorralBroken extends Corral { - - @Inject - @British - Cow cow; - - public void ping() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.field.managed.dependent; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SuppressWarnings("serial") +@SessionScoped +public class FieldInjectionCorralBroken extends Corral { + + @Inject + @British + Cow cow; + + public void ping() { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ManagedBeanWithIllegalDependencyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ManagedBeanWithIllegalDependencyTest.java index 62adb3930e..36b44ae154 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ManagedBeanWithIllegalDependencyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/ManagedBeanWithIllegalDependencyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -39,13 +39,13 @@ public static WebArchive createTestArchive() { @Test @SpecAssertion(section = PASSIVATION_VALIDATION, id = "fbb") public void testFieldInjectionPointRequiringPassivationCapableDependency() { - verify(FieldInjectionCorralBroken.class); + verify(FieldInjectionCorralBroken.class); } @Test @SpecAssertion(section = PASSIVATION_VALIDATION, id = "fbb") public void testSetterInjectionPointRequiringPassivationCapableDependency() { - verify(SetterInjectionCorralBroken.class); + verify(SetterInjectionCorralBroken.class); } @Test @@ -53,8 +53,8 @@ public void testSetterInjectionPointRequiringPassivationCapableDependency() { public void testConstructorInjectionPointRequiringPassivationCapableDependency() { verify(ConstructorInjectionCorralBroken.class); } - - private void verify(Class clazz){ + + private void verify(Class clazz) { try { getContextualReference(clazz).ping(); } catch (Throwable t) { @@ -62,6 +62,6 @@ private void verify(Class clazz){ return; } Assert.fail(); - + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/SetterInjectionCorralBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/SetterInjectionCorralBroken.java index d2971b1807..2595fe3aa4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/SetterInjectionCorralBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/field/managed/dependent/SetterInjectionCorralBroken.java @@ -22,10 +22,10 @@ public class SetterInjectionCorralBroken extends Corral { private Cow cow; @Inject - public void setCow(@British Cow cow){ - this.cow = cow; + public void setCow(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/Broken_Record.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/Broken_Record.java index ee9c1c7946..1819e41368 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/Broken_Record.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/Broken_Record.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/NonPassivationCapableProducerMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/NonPassivationCapableProducerMethodTest.java index 39b8ff2cbf..06ecf80534 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/NonPassivationCapableProducerMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/NonPassivationCapableProducerMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,7 @@ import org.testng.annotations.Test; /** - * + * * @author Shane Bryzak */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/RecordProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/RecordProducer.java index ce36cd57c2..47f1d60fa9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/RecordProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/RecordProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,7 @@ @Dependent public class RecordProducer { - public final @Produces - @SessionScoped - Broken_Record getRecord() { + public final @Produces @SessionScoped Broken_Record getRecord() { return new Broken_Record(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/British.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/British.java index f4b414172c..22ec7d8e29 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/British.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/British.java @@ -1,38 +1,38 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.method.managed.dependent; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.inject.Qualifier; - -@Qualifier -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -public @interface British { - - public static class BritishLiteral extends AnnotationLiteral implements British{ - - public static British INSTANCE = new BritishLiteral(); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.method.managed.dependent; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; + +@Qualifier +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +public @interface British { + + public static class BritishLiteral extends AnnotationLiteral implements British { + + public static British INSTANCE = new BritishLiteral(); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ConstructorInjectionCorralBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ConstructorInjectionCorralBroken.java index a9babda092..16e8a0e6b8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ConstructorInjectionCorralBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ConstructorInjectionCorralBroken.java @@ -21,14 +21,15 @@ public class ConstructorInjectionCorralBroken extends Ranch { private Cow cow; - public ConstructorInjectionCorralBroken(){} + public ConstructorInjectionCorralBroken() { + } @Inject - public ConstructorInjectionCorralBroken(@British Cow cow){ - this.cow = cow; + public ConstructorInjectionCorralBroken(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Cow.java index aa9e332b2d..dae5bac644 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/CowProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/CowProducer.java index df07d0485d..d9b2d5f8bb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/CowProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/CowProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/FieldInjectionCorralBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/FieldInjectionCorralBroken.java index 62a8c17da2..19344455e7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/FieldInjectionCorralBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/FieldInjectionCorralBroken.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.method.managed.dependent; - -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SessionScoped -public class FieldInjectionCorralBroken extends Ranch { - - @Inject - @British - Cow cow; - - public void ping() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.method.managed.dependent; + +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SessionScoped +public class FieldInjectionCorralBroken extends Ranch { + + @Inject + @British + Cow cow; + + public void ping() { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Herd.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Herd.java index 5ee1d11e28..fbb11ef4f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Herd.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Herd.java @@ -13,7 +13,8 @@ */ package org.jboss.cdi.tck.tests.full.context.passivating.broken.producer.method.managed.dependent; -public class Herd extends Ranch{ - - public void ping(){} +public class Herd extends Ranch { + + public void ping() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ManagedBeanWithIllegalDependencyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ManagedBeanWithIllegalDependencyTest.java index 639718e550..d31e39c6e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ManagedBeanWithIllegalDependencyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ManagedBeanWithIllegalDependencyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -59,7 +59,7 @@ public void testConstructorInjectionPointRequiringPassivationCapableDependency() @Test @SpecAssertion(section = PASSIVATION_VALIDATION, id = "fab") public void testProducerMethodParamInjectionPointRequiringPassivationCapableDependency() { - verify(Herd.class, British.BritishLiteral.INSTANCE); + verify(Herd.class, British.BritishLiteral.INSTANCE); } private void verify(Class clazz, Annotation... annotations) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ProducerMethodParamInjectionCorralBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ProducerMethodParamInjectionCorralBroken.java index 67d2c2e4c9..1def903e3a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ProducerMethodParamInjectionCorralBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/ProducerMethodParamInjectionCorralBroken.java @@ -20,13 +20,13 @@ public class ProducerMethodParamInjectionCorralBroken extends Ranch { @Override public void ping() { - + } - + @Produces @British @SessionScoped - public Herd produce(@British Cow cow){ - return new Herd(); + public Herd produce(@British Cow cow) { + return new Herd(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Ranch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Ranch.java index 40bcc795cd..fdcc7811c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Ranch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/Ranch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/SetterInjectionCorralBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/SetterInjectionCorralBroken.java index 2efba9ee0f..dbb3e897da 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/SetterInjectionCorralBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/broken/producer/method/managed/dependent/SetterInjectionCorralBroken.java @@ -22,10 +22,10 @@ public class SetterInjectionCorralBroken extends Ranch { private Cow cow; @Inject - public void setCow(@British Cow cow){ - this.cow = cow; + public void setCow(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/custom/CustomPassivatingScopeCalledWithSerializableParametersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/custom/CustomPassivatingScopeCalledWithSerializableParametersTest.java index 243a6efc2d..fc8babf284 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/custom/CustomPassivatingScopeCalledWithSerializableParametersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/custom/CustomPassivatingScopeCalledWithSerializableParametersTest.java @@ -33,7 +33,7 @@ *

      * This test was originally part of the Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Boss.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Boss.java index 6bec1e56e5..74ed24d5ed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Boss.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Boss.java @@ -37,7 +37,6 @@ public void init() { this.id = UUID.randomUUID().toString(); } - public BeanManager getBeanManager() { return beanManager; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/BuiltinBeanPassivationDependencyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/BuiltinBeanPassivationDependencyTest.java index f4ba60009b..ced9203931 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/BuiltinBeanPassivationDependencyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/BuiltinBeanPassivationDependencyTest.java @@ -20,10 +20,6 @@ import java.io.IOException; -import jakarta.enterprise.inject.spi.Annotated; -import jakarta.enterprise.inject.spi.AnnotatedMember; -import jakarta.enterprise.inject.spi.AnnotatedParameter; -import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -54,11 +50,10 @@ public static WebArchive createTestArchive() { @Inject Boss boss; - + @Inject InspectorAssistant inspectorAssist; - @Test @SpecAssertion(section = PASSIVATION_CAPABLE_DEPENDENCY, id = "ea") public void testInstance() throws IOException, ClassNotFoundException { @@ -95,7 +90,7 @@ public void testBeanManager() throws IOException, ClassNotFoundException { assertEquals(bossCopy.getId(), bossId); assertEquals(bossCopy.getBeanManager().getBeans(Boss.class).size(), 1); } - + @Test @SpecAssertion(section = PASSIVATION_CAPABLE_DEPENDENCY, id = "ec") public void testInjectionPoint() throws IOException, ClassNotFoundException { @@ -107,7 +102,7 @@ public void testInjectionPoint() throws IOException, ClassNotFoundException { byte[] serializedInspector = passivate(inspector); Inspector inspectorCopy = (Inspector) activate(serializedInspector); - + assertNotNull(inspectorCopy); assertNotNull(inspectorCopy.getInjectionPoint()); assertEquals(inspectorCopy.getId(), inspectorId); @@ -118,8 +113,10 @@ public void testInjectionPoint() throws IOException, ClassNotFoundException { // Annotated does not necessarily implement equals()/hashcode() so we need to test the underlying Java reflection object Assert.assertAnnotated(inspectorCopy.getInjectionPoint().getAnnotated(), inspector.getInjectionPoint().getAnnotated()); - assertEquals(inspectorCopy.getInjectionPoint().getAnnotated().getBaseType(), inspector.getInjectionPoint().getAnnotated().getBaseType()); - assertEquals(inspectorCopy.getInjectionPoint().getAnnotated().getAnnotations(), inspector.getInjectionPoint().getAnnotated().getAnnotations()); + assertEquals(inspectorCopy.getInjectionPoint().getAnnotated().getBaseType(), + inspector.getInjectionPoint().getAnnotated().getBaseType()); + assertEquals(inspectorCopy.getInjectionPoint().getAnnotated().getAnnotations(), + inspector.getInjectionPoint().getAnnotated().getAnnotations()); assertEquals(inspectorCopy.getInjectionPoint().isDelegate(), inspector.getInjectionPoint().isDelegate()); assertEquals(inspectorCopy.getInjectionPoint().isTransient(), inspector.getInjectionPoint().isTransient()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Inspector.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Inspector.java index 6b6ee744ab..d59f72a21a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Inspector.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/dependency/builtin/Inspector.java @@ -29,21 +29,21 @@ public class Inspector implements Serializable { private static final long serialVersionUID = 7238311288238399562L; - + private String id; - + @PostConstruct private void init() { id = UUID.randomUUID().toString(); } - + @Inject InjectionPoint injectionPoint; - + public InjectionPoint getInjectionPoint() { return injectionPoint; } - + public String getId() { return id; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerFieldProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerFieldProducer.java index 32987985c5..3730162a97 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerFieldProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerFieldProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerMethodProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerMethodProducer.java index cd430fac19..94b365447f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerMethodProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerMethodProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerToTheUltimateQuestion.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerToTheUltimateQuestion.java index e0baadf3ea..5b5d63e774 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerToTheUltimateQuestion.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/AnswerToTheUltimateQuestion.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerMethodWithPrimitiveReturnTypePassivationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerMethodWithPrimitiveReturnTypePassivationTest.java index ed1a0afa9d..b1192df66a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerMethodWithPrimitiveReturnTypePassivationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerMethodWithPrimitiveReturnTypePassivationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerWithPrimitiveFieldTypePassivationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerWithPrimitiveFieldTypePassivationTest.java index 2e8552ab1a..47f0c84fe3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerWithPrimitiveFieldTypePassivationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/producer/ProducerWithPrimitiveFieldTypePassivationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java index 1e0d025909..3c5da5b366 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/DecoratorWithNonPassivationCapableDependenciesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,11 +32,11 @@ /** * Verifies that a decorator that is passivation capable while having non-passivation capable dependencies is allowed provided * it does not decorate a bean declaring passivation scope. - * + * *

      * This test was originally part of Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Engine.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Engine.java index 5f4cd417f7..e20dbb693c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Engine.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Engine.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePowered.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePowered.java index fb69ae5a45..92772007c8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePowered.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePowered.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePoweredInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePoweredInterceptor.java index 9498a7d26a..ec3e2b3b50 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePoweredInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/EnginePoweredInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,9 +23,9 @@ /** * This interceptor class is passivation capable but it has non-passivation capable dependencies. This is allowed provided it * does not intercept a bean declaring passivation scope. - * + * * @author Jozef Hartinger - * + * */ @Interceptor @EnginePowered diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Ferry.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Ferry.java index 048a41ea1b..0161a7d3f9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Ferry.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Ferry.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * This bean is passivation capable although it is not required to be (it does not declare a passivating scope). - * + * */ @EnginePowered @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java index f741f9464b..5c65fa467c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/InterceptorWithNonPassivationCapableDependenciesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import static org.testng.Assert.assertEquals; import jakarta.enterprise.inject.spi.InterceptionType; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -30,11 +31,11 @@ /** * Verifies that an interceptor that is passivation capable while having non-passivation capable dependencies is allowed * provided it does not intercept a bean declaring passivation scope. - * + * *

      * This test was originally part of Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Vessel.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Vessel.java index 8700da2877..5b2dedbeb9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Vessel.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/Vessel.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/VesselDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/VesselDecorator.java index cee6dd20e1..ac60a1d62f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/VesselDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/context/passivating/validation/VesselDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/AbstractDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/AbstractDecoratorTest.java index 8ebfac3c8f..1d55724f9a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/AbstractDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/AbstractDecoratorTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ public abstract class AbstractDecoratorTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecorator.java index 5650a54413..58ff9a6083 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecorator.java @@ -28,7 +28,7 @@ /** * @author Martin Kouba - * + * */ @Decorator @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java index e8bb12d087..2136b1a20e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/BeanManagerDecoratorTest.java @@ -22,6 +22,7 @@ import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -34,7 +35,7 @@ /** * The {@link BeanManager} built-in bean is never intercepted by decorators. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -46,7 +47,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BeanManagerDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(BeanManagerDecorator.class)).build(); + new BeansXml().decorators(BeanManagerDecorator.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/Foo.java index dcd0641b2b..da73d683e1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/Foo.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/FooObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/FooObserver.java index a46ed8bc65..355583d6f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/FooObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/beanmanager/FooObserver.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ @RequestScoped public class FooObserver { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java index f4b526ac72..0b7fdb6932 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/BuiltinConversationDecoratorTest.java @@ -20,8 +20,12 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import java.lang.reflect.Type; +import java.util.Collections; + import jakarta.enterprise.context.Conversation; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -32,12 +36,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; - /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) @@ -49,7 +50,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinConversationDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(ConversationDecorator.class)).build(); + new BeansXml().decorators(ConversationDecorator.class)) + .build(); } @Inject @@ -59,7 +61,8 @@ public static WebArchive createTestArchive() { Conversation conversation; @Test - @SpecAssertions({ @SpecAssertion(section = DECORATOR_INVOCATION, id = "ach"), @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = DECORATOR_INVOCATION, id = "ach"), + @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa") }) public void testDecoratorIsResolved() { checkDecorator(resolveUniqueDecorator(Collections. singleton(Conversation.class)), ConversationDecorator.class, Collections. singleton(Conversation.class), Conversation.class); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationDecorator.java index 6f002c3068..217edea040 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationDecorator.java @@ -23,7 +23,7 @@ /** * @author Martin Kouba - * + * */ @Decorator @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationObserver.java index 2dc4da3d59..36c808d588 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/conversation/ConversationObserver.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @RequestScoped public class ConversationObserver { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/BuiltinEventDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/BuiltinEventDecoratorTest.java index ecce044120..210af0d255 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/BuiltinEventDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/BuiltinEventDecoratorTest.java @@ -20,9 +20,13 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Type; +import java.util.Collections; + import jakarta.enterprise.event.Event; import jakarta.enterprise.util.TypeLiteral; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -34,12 +38,9 @@ import org.testng.Assert; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; - /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) @@ -51,7 +52,9 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinEventDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(FooEventDecorator.class, StringEventDecorator.class, CharSequenceEventDecorator.class)).build(); + new BeansXml().decorators(FooEventDecorator.class, StringEventDecorator.class, + CharSequenceEventDecorator.class)) + .build(); } @Inject @@ -64,7 +67,8 @@ public static WebArchive createTestArchive() { private Event stringEvent; @Test - @SpecAssertions({ @SpecAssertion(section = DECORATOR_INVOCATION, id = "aca"), @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = DECORATOR_INVOCATION, id = "aca"), + @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa") }) public void testDecoratorIsResolved() { @SuppressWarnings("serial") TypeLiteral> eventFooLiteral = new TypeLiteral>() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Foo.java index 6de8c17c5d..1a79bbe895 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Foo.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/FooEventDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/FooEventDecorator.java index ed7c4bec09..5ba5b58f33 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/FooEventDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/FooEventDecorator.java @@ -23,7 +23,7 @@ /** * @author Martin Kouba - * + * */ @Decorator @SuppressWarnings("serial") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Observer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Observer.java index 96ccdd85fb..efbc33d851 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Observer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/Observer.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ @RequestScoped public class Observer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/complex/ComplexEventDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/complex/ComplexEventDecoratorTest.java index 8cb95b4f74..41f7602f61 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/complex/ComplexEventDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/event/complex/ComplexEventDecoratorTest.java @@ -35,9 +35,9 @@ /** * Test that uses a more complex scenario to verify that Decorators can be used to alter event delivery logic. - * + * * @author Jozef Hartinger - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class ComplexEventDecoratorTest extends AbstractTest { @@ -54,7 +54,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(ComplexEventDecoratorTest.class) .withExtension(OrderedEventDeliveryExtension.class) .withBeansXml( - new BeansXml().decorators(OrderedEventDeliveryDecorator.class)).build(); + new BeansXml().decorators(OrderedEventDeliveryDecorator.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java index 0db9da43fe..0336cc6c3d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/injectionpoint/BuiltinInjectionPointDecoratorTest.java @@ -35,7 +35,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -48,7 +48,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinInjectionPointDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(InjectionPointDecorator.class)).build(); + new BeansXml().decorators(InjectionPointDecorator.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java index 8fb0f110bd..67a4b9e228 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/builtin/instance/BuiltinInstanceDecoratorTest.java @@ -19,10 +19,16 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; + import jakarta.enterprise.inject.Instance; import jakarta.enterprise.util.TypeLiteral; import jakarta.inject.Inject; import jakarta.inject.Provider; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -33,11 +39,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; - /** * Basic test for decorating built-in {@link Instance} bean. * @@ -54,7 +55,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinInstanceDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(MuleInstanceDecorator.class)).build(); + new BeansXml().decorators(MuleInstanceDecorator.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/DependentContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/DependentContextTest.java index f59c76f6d7..b87fd22ba0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/DependentContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/DependentContextTest.java @@ -13,8 +13,12 @@ */ package org.jboss.cdi.tck.tests.full.decorators.context.dependent; +import static org.jboss.cdi.tck.TestGroups.CDI_FULL; +import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_OBJECTS; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -23,32 +27,29 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.CDI_FULL; -import static org.jboss.cdi.tck.cdi.Sections.DEPENDENT_OBJECTS; - @SpecVersion(spec = "cdi", version = "2.0") public class DependentContextTest extends AbstractTest { - @Deployment - public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClassPackage(DependentContextTest.class).withBeansXml("beans.xml").build(); - } + @Deployment + public static WebArchive createTestArchive() { + return new WebArchiveBuilder().withTestClassPackage(DependentContextTest.class).withBeansXml("beans.xml").build(); + } - @Test(groups = CDI_FULL) - @SpecAssertion(section = DEPENDENT_OBJECTS, id = "ab") - public void testDependentScopedDecoratorsAreDependentObjectsOfBean() { - Bean roomBean = getBeans(Interior.class, new RoomBinding()).iterator().next(); + @Test(groups = CDI_FULL) + @SpecAssertion(section = DEPENDENT_OBJECTS, id = "ab") + public void testDependentScopedDecoratorsAreDependentObjectsOfBean() { + Bean roomBean = getBeans(Interior.class, new RoomBinding()).iterator().next(); - CreationalContext roomCreationalContext = getCurrentManager().createCreationalContext(roomBean); - Interior room = (Interior) getCurrentManager().getReference(roomBean, Interior.class, roomCreationalContext); + CreationalContext roomCreationalContext = getCurrentManager().createCreationalContext(roomBean); + Interior room = (Interior) getCurrentManager().getReference(roomBean, Interior.class, roomCreationalContext); - InteriorDecorator.reset(); + InteriorDecorator.reset(); - room.foo(); + room.foo(); - assert InteriorDecorator.getInstances().size() == 1; - roomCreationalContext.release(); - assert InteriorDecorator.isDestroyed(); - } + assert InteriorDecorator.getInstances().size() == 1; + roomCreationalContext.release(); + assert InteriorDecorator.isDestroyed(); + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Interior.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Interior.java index 96ae40e6c1..b34745cd05 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Interior.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Interior.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorDecorator.java index 5795cb21b6..db1062cc35 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorRoom.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorRoom.java index c4f5b6d471..296cbd72db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorRoom.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/InteriorRoom.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Room.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Room.java index 544f124679..0df95df883 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Room.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/Room.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/RoomBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/RoomBinding.java index f983bb8cf9..556de7f449 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/RoomBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/context/dependent/RoomBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/AfterBeanDiscoveryObserver.java index e61423075c..a0231ae312 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Bus.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Bus.java index 79f14260a2..5c967e329e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Bus.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Bus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorImplementation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorImplementation.java index 6a1a93cdc3..03e9678933 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorImplementation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorImplementation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorTest.java index 03296b19b5..7eb698506a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/CustomDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -42,7 +42,8 @@ public static WebArchive createTestArchive() { @SuppressWarnings("unchecked") @Test(groups = CDI_FULL) - @SpecAssertions({ @SpecAssertion(section = DECORATOR_RESOLUTION, id = "b"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "bc"), + @SpecAssertions({ @SpecAssertion(section = DECORATOR_RESOLUTION, id = "b"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "bc"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dc") }) public void testCustomImplementationOfDecoratorInterface() { assert getContextualReference(Vehicle.class).start().equals("Bus started and decorated."); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Vehicle.java index 903c23ff2f..7278397e95 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/Vehicle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/VehicleDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/VehicleDecorator.java index 8baaab5b7c..ea2608a605 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/VehicleDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/VehicleDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/AfterBeanDiscoveryObserver.java index e7108a63c1..d2520055e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Bus.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Bus.java index ae20f0c04c..2a53e6a60a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Bus.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Bus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/BusGarage.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/BusGarage.java index 3e613e5118..315956b86b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/BusGarage.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/BusGarage.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorImplementation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorImplementation.java index 76e198c82a..99c07c035c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorImplementation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorImplementation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java index 75148d1ba4..7ebc28e89a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Truck.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Truck.java index 6c3a636ce3..7fb670ffbd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Truck.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Truck.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Vehicle.java index daa6700b73..b4f1b8fc8c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/Vehicle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/VehicleDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/VehicleDecorator.java index 2bc29817d1..32394e4736 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/VehicleDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/finalBeanClass/VehicleDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/AfterBeanDiscoveryObserver.java index dbc247f73a..93dffbbfa0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Bus.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Bus.java index 9015b74b9a..f454420ba7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Bus.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Bus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecorator.java index fdf0a910f3..eccbe0169e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecoratorWithNoDelegateInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecoratorWithNoDelegateInjectionPointTest.java index 0ca5bf4ede..37ac8f71f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecoratorWithNoDelegateInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/CustomDecoratorWithNoDelegateInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Vehicle.java index 63ef0891f9..586e9782a8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/Vehicle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/VehicleDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/VehicleDecorator.java index f91d8c2d18..15cac77297 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/VehicleDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/nodelegateinjectionpoint/VehicleDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/AfterBeanDiscoveryObserver.java index fdd70784d0..c81ebfd683 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Bus.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Bus.java index 0b932ba265..3ef765f8b7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Bus.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Bus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecorator.java index 22581843ab..e9e10f5b4e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecoratorWithTooManyDelegateInjectionPointsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecoratorWithTooManyDelegateInjectionPointsTest.java index 7be22e13dd..a9a12e8932 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecoratorWithTooManyDelegateInjectionPointsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/CustomDecoratorWithTooManyDelegateInjectionPointsTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Vehicle.java index f7dee0d3d4..c376a67869 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/Vehicle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/VehicleDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/VehicleDecorator.java index c239bbba93..13388a926c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/VehicleDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/custom/broken/toomanydelegateinjectionpoints/VehicleDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/AbstractFooDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/AbstractFooDecorator.java index d3c9b150c6..ddce83a00e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/AbstractFooDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/AbstractFooDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class AbstractFooDecorator implements Boo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Account.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Account.java index 03e92aa82f..bdc04a6124 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Account.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Account.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ public interface Account { public void withdraw(int amount); public void deposit(int amount); - + public int getBalance(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BankAccount.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BankAccount.java index 48334a7f11..43f8ef2518 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BankAccount.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BankAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bar.java index a0a231577d..e8338197e1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Bar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Baz.java index cd1690f1d3..422b71a3c0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Baz { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator1.java index 6867f989e6..7014f778d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class BazDecorator1 implements Baz { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator2.java index 0eb4be04ab..b1cba189b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BazDecorator2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class BazDecorator2 implements Baz { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bazt.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bazt.java index a55e9124d3..ee5548d695 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bazt.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Bazt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Bazt extends Baz { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BaztImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BaztImpl.java index 13495ad6aa..b0dcc6479e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BaztImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/BaztImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class BaztImpl implements Bazt { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Boo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Boo.java index e3865e035f..2d58904a11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Boo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Boo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Boo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/ChargeDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/ChargeDecorator.java index a760ea7e77..79bbe25546 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/ChargeDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/ChargeDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * Only withdrawal is charged. Implicit implementation that calls the method on the delegate is provided for * {@link Account#deposit(int)}. - * + * * @author Martin Kouba */ @Decorator diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/CowShed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/CowShed.java index ecebfb3109..aa1552c8d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/CowShed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/CowShed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ public class CowShed { 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 730bb21eec..f258bfcc80 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 @@ -28,10 +28,16 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.HashSet; +import java.util.List; + import jakarta.decorator.Delegate; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.Decorator; -import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -42,12 +48,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.io.Serializable; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.HashSet; -import java.util.List; - /** * @author pmuir * @author Martin Kouba @@ -63,11 +63,13 @@ public static WebArchive createTestArchive() { .withTestClassPackage(DecoratorDefinitionTest.class) .withBeansXml(new BeansXml().decorators(BazDecorator1.class, BazDecorator2.class, FooDecorator.class, TimestampLogger.class, - ChargeDecorator.class)).build(); + ChargeDecorator.class)) + .build(); } @Test - @SpecAssertions({ @SpecAssertion(section = DECORATOR_BEAN, id = "d"), @SpecAssertion(section = DECORATOR_ANNOTATION, id = "a"), + @SpecAssertions({ @SpecAssertion(section = DECORATOR_BEAN, id = "d"), + @SpecAssertion(section = DECORATOR_ANNOTATION, id = "a"), @SpecAssertion(section = DECORATED_TYPES, id = "c"), @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa"), @SpecAssertion(section = DECORATOR, id = "a"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "g") }) public void testDecoratorIsManagedBean() { @@ -108,7 +110,7 @@ public void testDelegateInjectionPoint() { assertEquals(decorators.size(), 1); Decorator decorator = decorators.get(0); assertEquals(decorator.getInjectionPoints().size(), 1); - assertEquals(decorator.getInjectionPoints().iterator().next().getType(),Logger.class); + assertEquals(decorator.getInjectionPoints().iterator().next().getType(), Logger.class); assertTrue(decorator.getInjectionPoints().iterator().next().getAnnotated().isAnnotationPresent(Delegate.class)); assertEquals(decorator.getDelegateType(), Logger.class); assertEquals(decorator.getDelegateQualifiers().size(), 1); @@ -123,7 +125,8 @@ public void testDecoratorDoesNotImplementDelegateType() { } @Test - @SpecAssertions({ @SpecAssertion(section = ENABLED_DECORATORS_BEAN_ARCHIVE, id = "b"), @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa"), + @SpecAssertions({ @SpecAssertion(section = ENABLED_DECORATORS_BEAN_ARCHIVE, id = "b"), + @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa"), @SpecAssertion(section = BM_DECORATOR_RESOLUTION, id = "a") }) public void testDecoratorOrdering() { List> decorators = getCurrentManager().resolveDecorators(Bazt.TYPES); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Field.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Field.java index 22f6c2e77e..d6f71c9f29 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Field.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Field.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Field { public static final Set TYPES = new HashSet(Arrays.asList(Field.class)); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldDecorator.java index 7ecb56940c..c2030c467a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class FieldDecorator implements Field { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldImpl.java index 31b026395d..04e961dfe1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FieldImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class FieldImpl implements Field { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Foo.java index ca5c4cf79c..3f498b5b4f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,7 +21,7 @@ /** * @author pmuir - * + * */ public interface Foo extends Baz, Serializable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBar.java index 4e3befd10a..3770b40586 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface FooBar extends Foo, Bar, Boo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBarImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBarImpl.java index cf04082db9..60efe163f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBarImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooBarImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,14 +17,14 @@ /** * @author pmuir - * + * */ @Dependent public class FooBarImpl implements FooBar { /** - * - */ + * + */ private static final long serialVersionUID = 9211059814119576671L; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooDecorator.java index 7f3573d644..ff34cf603d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/FooDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,15 +20,15 @@ /** * @author pmuir - * + * */ @Decorator @Meta public class FooDecorator extends AbstractFooDecorator implements Foo, Bar { /** - * - */ + * + */ private static final long serialVersionUID = -2253839366401409666L; @Inject @Delegate diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Logger.java index 2935ef12bf..4ee3dcbf97 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Logger { 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 9045276b50..490351da6c 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/MockLogger.java index 373b9a2b6f..f0070457ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class MockLogger implements Logger { 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 7cdf1da5e0..6e9ffc011d 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 @@ -6,15 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.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; @@ -25,6 +23,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/TimestampLogger.java index 283e7054fc..bc03d7da5d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java index 0c0cb5ec96..413b9021ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java @@ -42,7 +42,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorListedTwiceInBeansXmlTest.class) .withBeansXml( - new BeansXml().decorators(PresentDecorator.class, PresentDecorator.class)).build(); + new BeansXml().decorators(PresentDecorator.class, PresentDecorator.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java index 471648fbb4..d6d8d81b2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java index 2eeb665c29..771824ec52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java index 0745b2dd6b..dea742612b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/EnabledDecoratorNotADecoratorTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_DECORATORS_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -40,7 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(EnabledDecoratorNotADecoratorTest.class) .withBeansXml( - new BeansXml().decorators(TimestampLogger.class)).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java index 03021d68c3..53ee7f7977 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/Logger.java @@ -13,7 +13,6 @@ */ package org.jboss.cdi.tck.tests.full.decorators.definition.broken.enabledDecoratorIsNotDecorator; - /** * @author pmuir * diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java index 54b8912a60..075acd5809 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java index 6169335477..67ac90d8e3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/enabledDecoratorIsNotDecorator/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public abstract class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java index c944a85bd8..30a8975e25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATOR_RESOLUTION; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -40,7 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(FinalBeanClassTest.class) .withBeansXml( - new BeansXml().decorators(TimestampLogger.class)).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/Logger.java index 06db6e54f2..a2ac93e073 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/MockLogger.java index 48e61b1975..cfe6cc58a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public final class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/TimestampLogger.java index 4047df4a87..356ce85080 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanClass/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java index fc4f3023b1..e33570be0f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/Logger.java index 84ddd1b2c2..96fa77b639 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/MockLogger.java index b7d3dbdd2d..2a8b8d2d4f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/TimestampLogger.java index 9753005df1..6bdaa09696 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/finalBeanMethod/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/Account.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/Account.java index 039c86b827..de89c242d5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/Account.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/Account.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/BankAccount.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/BankAccount.java index e27cfbf192..8b552c02db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/BankAccount.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/BankAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java index 7b51039630..49b0904c48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/DecoratorWithInvalidAbstractMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,7 +31,7 @@ /** * Test that if a decorator has abstract methods that are not declared by a decorated type, the container automatically detects * the problem and treats it as a definition error. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/ThiefDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/ThiefDecorator.java index 8e6e62914c..7f78cac147 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/ThiefDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/invalidAbstractMethodOnDecorator/ThiefDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java index 5dcd80a4cf..3dfe3b3c68 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java index a625f649e4..ee1c0e3b68 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java index 1b238c977c..ae4e28a086 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/MultipleDelegateInjectionPointsTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -41,7 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(MultipleDelegateInjectionPointsTest.class) .withBeansXml( - new BeansXml().decorators(TimestampLogger.class)).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java index f6d352c3c4..5735e26c90 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/multipleDelegateInjectionPoints/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/Logger.java index f1c1cddc90..ef90b8489b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java index b47618b97c..4f859a3dc3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java index 55f4d5867c..1c7763e959 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/NoDelegateInjectionPointsTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DELEGATE_ATTRIBUTE; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -40,7 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NoDelegateInjectionPointsTest.class) .withBeansXml( - new BeansXml().decorators(TimestampLogger.class)).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java index 6d2a5c9d26..098086b4eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/noDelegateInjectionPoints/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes1Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes1Test.java index 4cfcf5dc6c..8b819eb116 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes1Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes1Test.java @@ -31,7 +31,7 @@ *

      * This test was originally part of the Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java index f040eabf4c..ee6dff3412 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes2Test.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATOR_BEAN; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -31,7 +32,7 @@ *

      * This test was originally part of the Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes3Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes3Test.java index 4828539883..b512e2e68a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes3Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/DecoratorWithNoDecoratedTypes3Test.java @@ -33,7 +33,7 @@ *

      * This test was originally part of the Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -46,7 +46,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(DecoratorWithNoDecoratedTypes1Test.class) .withClasses(Glue.class, GlueDecorator.class, GlueDecoratorExtension.class, ForwardingBeanAttributes.class, - ForwardingInjectionPoint.class).withExtension(GlueDecoratorExtension.class).build(); + ForwardingInjectionPoint.class) + .withExtension(GlueDecoratorExtension.class).build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/NonExisting.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/NonExisting.java index 2a99cafa91..c07679901a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/NonExisting.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/NonExisting.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.inject.Qualifier; @Target({ TYPE, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/SerializableDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/SerializableDecorator.java index 003deafb21..e5f0fe9d9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/SerializableDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nodecoratedtypes/SerializableDecorator.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.full.decorators.definition.broken.nodecoratedtypes; import java.io.Serializable; + import jakarta.annotation.Priority; import jakarta.decorator.Decorator; import jakarta.decorator.Delegate; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java index 5b9442ffee..70535bd2e9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java index 88c995665a..cc426acb74 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java index abca97eb50..5d0da7983e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,7 @@ import org.testng.annotations.Test; /** - * + * * @author Shane Bryzak * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java index c146fd17f4..432a5afc4f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/nonExistantClassInBeansXml/NonExistantDecoratorClassInBeansXmlTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_DECORATORS_BEAN_ARCHIVE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java index 65bbf5b7e6..688d51bc52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/EnhancedLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface EnhancedLogger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java index ce4fb23852..86d0417e56 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java index a347f9a9f7..767afb926a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class MockLogger implements Logger, EnhancedLogger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java index 95dd17ef17..6746071288 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/NotAllDecoratedTypesImplementedTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATED_TYPES; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -40,7 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(NotAllDecoratedTypesImplementedTest.class) .withBeansXml( - new BeansXml().decorators(TimestampLogger.class)).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java index abe8b3f281..640e30947a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger, EnhancedLogger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/EnhancedLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/EnhancedLogger.java index fbe2798dbb..d21f57fffc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/EnhancedLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/EnhancedLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/Logger.java index 3046540178..56a76a5f04 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/Logger.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.decorators.definition.broken.notAllDecoratedTypesImplemented.parameterized; - public interface Logger { public void log(String string); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/MockLogger.java index 3078dbb43e..a747dfab62 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TimestampLogger.java index 9c3b688f78..33dbb4819c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger, EnhancedLogger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java index 8792d43879..beb36b7282 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/notAllDecoratedTypesImplemented/parameterized/TypeParametersNotTheSameTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class TypeParametersNotTheSameTest extends AbstractTest { @@ -43,7 +43,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(TypeParametersNotTheSameTest.class) .withBeansXml( - new BeansXml().decorators(TimestampLogger.class)).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java index 738ae4e4b1..89ee5ded86 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithAsyncObserverMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,7 +38,8 @@ public static WebArchive createTestArchive() { .withClasses(ApplicationLogger.class, FooPayload.class, Logger.class, MockLogger.class) .withTestClass(DecoratorWithAsyncObserverMethodTest.class) .withBeansXml( - new BeansXml().decorators(ApplicationLogger.class)).build(); + new BeansXml().decorators(ApplicationLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java index 8cc873a1c1..b602d480f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/DecoratorWithObserverMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,7 @@ /** * Test that decorators may not declare observer methods. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -43,7 +43,8 @@ public static WebArchive createTestArchive() { .withClasses(FilesystemLogger.class, FooPayload.class, Logger.class, MockLogger.class) .withTestClass(DecoratorWithObserverMethodTest.class) .withBeansXml( - new BeansXml().decorators(FilesystemLogger.class)).build(); + new BeansXml().decorators(FilesystemLogger.class)) + .build(); } @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/FooPayload.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/FooPayload.java index e5d74301df..68c11d1ecc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/FooPayload.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/FooPayload.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/Logger.java index 6b0e52e1ed..324a7e1bb5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/MockLogger.java index 3281291c94..7f40d6be5d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/observer/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java index f147c1b3cf..e3903a6156 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/DifferentTypeParametersTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATED_TYPES; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/Radio.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/Radio.java index dfdd78e80d..d36fd31565 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/Radio.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/Radio.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioDecorator.java index 30ff17f716..e3daf76c0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioProducer.java index 2aa64e13d8..d5cd93c6b1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/broken/parameterizedTypesWithDifferentTypeParameters/RadioProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/CowShed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/CowShed.java index 1e0ac88611..0afe853c6c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/CowShed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/CowShed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ public class CowShed { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java index e263bb1d49..d7be871ab1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/DelegateInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/Logger.java index be11c2f26a..8245c369ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/MockLogger.java index 53a2945872..367cb99f2c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/TimestampLogger.java index 27683e8fda..7868437207 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateConstructor/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/CowShed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/CowShed.java index e8ab40ff4a..a18e6d30ba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/CowShed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/CowShed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ public class CowShed { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java index 95b77f6544..1945768a26 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/DelegateFieldInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/Logger.java index 18937d4a75..128a78d93a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/MockLogger.java index 91e8045a2a..818d09eeae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/TimestampLogger.java index be3a290c4a..36e961a628 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateField/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/CowShed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/CowShed.java index 17d075ece8..9615a04b25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/CowShed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/CowShed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ public class CowShed { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java index 48618f4509..b7e0c670dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/DelegateInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/Logger.java index 2b2a4e1668..7afec1a93a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/MockLogger.java index d6d77bb789..e1f3a81218 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java index c8791b224b..016a9ed1ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/BankAccount.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/BankAccount.java index 922565cdba..9937ef9c36 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/BankAccount.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/BankAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ public interface BankAccount { public void withdraw(int amount); public void deposit(int amount); - + public int getBalance(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ChargeDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ChargeDecorator.java index 91f026b505..30b4295294 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ChargeDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ChargeDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java index 761bd3c2c0..e235b4c027 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DecoratorNotAppliedToResultOfProducerTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) @@ -41,7 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorNotAppliedToResultOfProducerTest.class) .withBeansXml( - new BeansXml().decorators(ChargeDecorator.class)).build(); + new BeansXml().decorators(ChargeDecorator.class)) + .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @@ -64,7 +65,8 @@ public void testDecoratorNotAppliedToResultOfProducerMethod(ShortTermAccount acc @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertion(section = DECORATORS, id = "b") - public void testDecoratorNotAppliedToResultOfProducerField(DurableAccount account, @Synthetic DurableAccount producedAccount) { + public void testDecoratorNotAppliedToResultOfProducerField(DurableAccount account, + @Synthetic DurableAccount producedAccount) { assertNotNull(account); assertNotNull(producedAccount); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DurableAccount.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DurableAccount.java index f06419ff7c..198655fd48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DurableAccount.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/DurableAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ShortTermAccount.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ShortTermAccount.java index aa2d8e0ccf..0ca02eb777 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ShortTermAccount.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/ShortTermAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/Synthetic.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/Synthetic.java index e7868e4c62..dd81b447b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/Synthetic.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/producer/Synthetic.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java index 2473de3c49..77d4d6b9eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/DelegateTypeImplementsParameterizedDecoratedTypeTest.java @@ -19,6 +19,7 @@ import static org.testng.Assert.assertEquals; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -31,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DelegateTypeImplementsParameterizedDecoratedTypeTest extends AbstractTest { @@ -41,7 +42,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DelegateTypeImplementsParameterizedDecoratedTypeTest.class) .withBeansXml( - new BeansXml().decorators(TimestampLogger.class)).build(); + new BeansXml().decorators(TimestampLogger.class)) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/EnhancedLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/EnhancedLogger.java index 3284e43f57..f352638e0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/EnhancedLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/EnhancedLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/Logger.java index 8229aa7d4a..688f0ad94b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/Logger.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.decorators.definition.types; - public interface Logger { public void log(String string); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/MockLogger.java index e0aa1efe0c..08e54556ee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class MockLogger implements Logger, EnhancedLogger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/TimestampLogger.java index ae764659d4..1576746023 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/definition/types/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public abstract class TimestampLogger implements Logger, EnhancedLogger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/DecoratorAndInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/DecoratorAndInterceptorTest.java index 97b0ee30da..f3f404f0b6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/DecoratorAndInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/DecoratorAndInterceptorTest.java @@ -45,7 +45,7 @@ public static WebArchive createTestArchive() { .withTestClassPackage(DecoratorAndInterceptorTest.class) .withBeansXml( new BeansXml().interceptors(FooInterceptor1.class, FooInterceptor2.class) - .decorators(FooDecorator1.class, FooDecorator2.class)) + .decorators(FooDecorator1.class, FooDecorator2.class)) .build(); } @@ -54,7 +54,8 @@ public static WebArchive createTestArchive() { * lifecycle callback interception are not business method invocation, and therefore are not intercepted by interceptors. */ @Test - @SpecAssertions({ @SpecAssertion(section = ENABLED_DECORATORS, id = "b"), @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "i"), + @SpecAssertions({ @SpecAssertion(section = ENABLED_DECORATORS, id = "b"), + @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "i"), @SpecAssertion(section = BIZ_METHOD, id = "ka"), @SpecAssertion(section = BIZ_METHOD, id = "kb"), @SpecAssertion(section = BIZ_METHOD, id = "kc"), @SpecAssertion(section = BIZ_METHOD, id = "kd") }) public void testMethodCallbacks() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/Foo.java index cf5fb65b01..5974f6f8cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding1.java index b4f54efac4..2246ef6d55 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding2.java index cc8109de39..47f18d2634 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooBinding2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator1.java index 2a03162259..ea2c98af4b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator2.java index d24e1298b4..e932072bcc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooDecorator2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor1.java index 3999388b07..076ca565a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; + import org.jboss.cdi.tck.util.ActionSequence; @Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor2.java index 4e4cc35472..ebb0931722 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooInterceptor2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; + import org.jboss.cdi.tck.util.ActionSequence; @Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooStuff.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooStuff.java index 7e76e011ec..bf1e1b99f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooStuff.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/interceptor/FooStuff.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.decorators.interceptor; - import jakarta.enterprise.context.Dependent; @FooBinding1 diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Bar.java index f0dcf96c86..cd0e299559 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarDecorator.java index cf09307820..8543d54067 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarImpl.java index 3e993f7f88..141741dd11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/BarImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/CowShed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/CowShed.java index 127aaff313..653cfeb8a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/CowShed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/CowShed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Dependent public class CowShed { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/DecoratorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/DecoratorInvocationTest.java index ae2e7b8556..b07460cad8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/DecoratorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/DecoratorInvocationTest.java @@ -42,7 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorInvocationTest.class) .withBeansXml(new BeansXml() - .decorators(BarDecorator.class, FooDecorator1.class, FooDecorator2.class, TimestampLogger.class)) + .decorators(BarDecorator.class, FooDecorator1.class, FooDecorator2.class, TimestampLogger.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Foo.java index 32d4facc12..7396c7df73 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator1.java index 28a2068269..a7287afc48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class FooDecorator1 implements Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator2.java index b70df88133..e41b5d6cd3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooDecorator2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class FooDecorator2 implements Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooImpl.java index ae81962cb2..999110e47b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/FooImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class FooImpl implements Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Logger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Logger.java index cbec2bb299..0bd821ec4d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Logger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/Logger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/MockLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/MockLogger.java index 77c026cf39..ab539ecb0a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/MockLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/MockLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Dependent public class MockLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/TimestampLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/TimestampLogger.java index 58adbd2637..f869fe110c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/TimestampLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/TimestampLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class TimestampLogger implements Logger { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/DecoratorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/DecoratorInvocationTest.java index a28cbafba6..296245707e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/DecoratorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/DecoratorInvocationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Foo.java index 5e8dea13db..df77974816 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Observer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Observer.java index 1ae809cb42..bac9678a7f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Observer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/Observer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Observer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverDecorator.java index 9f18dc9dd9..47c37c33a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class ObserverDecorator implements Observer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverImpl.java index da39e1b495..b3fa8e69ea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/observer/ObserverImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ public class ObserverImpl implements Observer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/DecoratorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/DecoratorInvocationTest.java index 61720d05bc..09542475f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/DecoratorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/DecoratorInvocationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Foo.java index 70ed72bbb3..803bf734c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Producer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Producer.java index 6caf5d71a9..f2c6dde696 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Producer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/Producer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public interface Producer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerDecorator.java index a426b4f957..9964a5290a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ @Decorator public class ProducerDecorator implements Producer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerImpl.java index 1808b2421c..73ccdb8ae0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/invocation/producer/method/ProducerImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ public class ProducerImpl implements Producer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java index 787e979e56..6036c2f3e4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/DecoratoredBeanProxyTest.java @@ -32,19 +32,18 @@ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratoredBeanProxyTest extends AbstractTest { + @Deployment + @ShouldThrowException(DeploymentException.class) + public static WebArchive createTestArchive() { + return new WebArchiveBuilder() + .withTestClassPackage(DecoratoredBeanProxyTest.class) + .withBeansXml(new BeansXml().decorators(MarineDecorator.class)) + .build(); + } - @Deployment - @ShouldThrowException(DeploymentException.class) - public static WebArchive createTestArchive() { - return new WebArchiveBuilder() - .withTestClassPackage(DecoratoredBeanProxyTest.class) - .withBeansXml(new BeansXml().decorators(MarineDecorator.class)) - .build(); - } + @Test(groups = CDI_FULL) + @SpecAssertions({ @SpecAssertion(section = UNPROXYABLE, id = "ea") }) + public void testClientProxyBeanWithAssociatedDecorator() { - @Test(groups = CDI_FULL) - @SpecAssertions({ @SpecAssertion(section = UNPROXYABLE, id = "ea") }) - public void testClientProxyBeanWithAssociatedDecorator() { - - } + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/MarineDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/MarineDecorator.java index a8882d363f..1d77c6d613 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/MarineDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/MarineDecorator.java @@ -21,12 +21,12 @@ @Decorator public abstract class MarineDecorator implements Fish { - @Inject - @Delegate - @Any - private Fish fish; + @Inject + @Delegate + @Any + private Fish fish; - public MarineDecorator() { - } + public MarineDecorator() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/TestBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/TestBean.java index 8e2eaa6410..4554019e64 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/TestBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/lookup/clientProxy/unproxyable/decorator/TestBean.java @@ -18,8 +18,8 @@ @Dependent public class TestBean { - - @Inject - Tuna tuna; + + @Inject + Tuna tuna; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Animal.java index 7eed3a71ad..6fb43832bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Bar.java index 826db50c7e..2081eb6891 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarDecorator.java index c27f42c9d0..c2ac72acf0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarImpl.java index 9cb8be1718..ac87db91bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BarImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Baz.java index 24db6ea897..df9732a75f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazDecorator.java index 63efba94fe..2a7e0582c4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazImpl.java index 4618e5fa4f..b9bd74f88d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/BazImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Corge.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Corge.java index 89f72bf73e..480d00042c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Corge.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Corge.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator.java index c72624404d..3ee9a91ffd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator2.java index 8d5f1c01aa..79fd4da533 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeDecorator2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl.java index 6a6405158b..1cd77139a4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl2.java index 7c15e846e7..6e6ab66a39 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/CorgeImpl2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Cow.java index 510823ed22..655f5b09f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/DecoratorResolutionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/DecoratorResolutionTest.java index 70dcd168aa..acffc95b3f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/DecoratorResolutionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/DecoratorResolutionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -73,21 +73,21 @@ private static boolean decoratorCollectionMatches(Collection> decor @Test @SpecAssertions({ @SpecAssertion(section = DELEGATE_ASSIGNABLE_PARAMETERS, id = "aa") }) public void testUnboundedTypeVariables() { - List> decorators = getCurrentManager().resolveDecorators(Collections.singleton(Bar.class)); + List> decorators = getCurrentManager().resolveDecorators(Collections. singleton(Bar.class)); assert decoratorCollectionMatches(decorators, BarDecorator.class); } @Test @SpecAssertions({ @SpecAssertion(section = DELEGATE_ASSIGNABLE_PARAMETERS, id = "ab") }) public void testObject() { - List> decorators = getCurrentManager().resolveDecorators(Collections.singleton(Baz.class)); + List> decorators = getCurrentManager().resolveDecorators(Collections. singleton(Baz.class)); assert decoratorCollectionMatches(decorators, BazDecorator.class); } @Test @SpecAssertions({ @SpecAssertion(section = DELEGATE_ASSIGNABLE_PARAMETERS, id = "ac") }) public void testUnboundedTypeVariablesAndObject() { - List> decorators = getCurrentManager().resolveDecorators(Collections.singleton(Foo.class)); + List> decorators = getCurrentManager().resolveDecorators(Collections. singleton(Foo.class)); assert decoratorCollectionMatches(decorators, FooDecorator.class, FooObjectDecorator.class); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FemaleFresianCow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FemaleFresianCow.java index 36f4002d8d..f0c0fee791 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FemaleFresianCow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FemaleFresianCow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Foo.java index 9ca960aed9..74ee1a73ae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooDecorator.java index 04e1cacc0c..c4478b2398 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooImpl.java index 6a9f82c7aa..0fa067791b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooObjectDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooObjectDecorator.java index 978ec91d40..17799238f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooObjectDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FooObjectDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FresianCow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FresianCow.java index aea2a3e94d..8369a073e9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FresianCow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/FresianCow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Garply.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Garply.java index 3a2aa349fb..f84b1f8a14 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Garply.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Garply.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyDecorator.java index f33fc394cb..75553a83f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyImpl.java index 5129950958..883dcc4e85 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GarplyImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Grault.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Grault.java index 81dc115407..e84baf4f1b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Grault.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Grault.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultExtendsDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultExtendsDecorator.java index d7b7f2e801..23553adcd9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultExtendsDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultExtendsDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultIntegerImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultIntegerImpl.java index ce1163e6f6..d74d9c7daa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultIntegerImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultIntegerImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultSuperDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultSuperDecorator.java index e0526cec63..d66537acdd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultSuperDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/GraultSuperDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Qux.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Qux.java index 4c1134fa49..8d4bd0ba15 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Qux.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/Qux.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxDecorator.java index 90839a3ceb..f36c4b4126 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxImpl.java index 940a9c3809..6ea5d5fbba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListDecorator.java index b91930b85d..2278fcc319 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListImpl.java index b596de7d4e..e4b0cbbd49 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/decorators/resolution/QuxListImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AfterBeanDiscoveryObserver.java index 9d6e13dc10..828c56b202 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AfterBeanDiscoveryObserver.java @@ -30,11 +30,11 @@ public void afterDiscovery(@Observes AfterBeanDiscovery event, BeanManager beanM // register custom alternative via configurator but don't select it event.addBean() - .beanClass(SomeBean.class) - .types(SomeBean.class, AlternativeSomeBean.class, Object.class) - .scope(ApplicationScoped.class) - .alternative(true) - .produceWith(obj -> new AlternativeSomeBean()); + .beanClass(SomeBean.class) + .types(SomeBean.class, AlternativeSomeBean.class, Object.class) + .scope(ApplicationScoped.class) + .alternative(true) + .produceWith(obj -> new AlternativeSomeBean()); } private AnnotatedField getAnnotatedField(BeanManager beanManager, Type memberType) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AlternativeStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AlternativeStereotype.java index 99efccced8..ce4dd9100c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AlternativeStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/AlternativeStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java index 8f667aa98b..a82c329072 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java @@ -49,15 +49,16 @@ public class CustomBeanImplementationTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(CustomBeanImplementationTest.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) - .withClasses(AfterBeanDiscoveryObserver.class, House.class, CustomInjectionPoint.class, Bar.class, PassivationCapableBean.class, SomeBean.class, AlternativeSomeBean.class) + .withClasses(AfterBeanDiscoveryObserver.class, House.class, CustomInjectionPoint.class, Bar.class, + PassivationCapableBean.class, SomeBean.class, AlternativeSomeBean.class) .withLibrary(Foo.class, FooBean.class, IntegerBean.class, Passivable.class, PassivableLiteral.class) .withExtension(AfterBeanDiscoveryObserver.class) .build(); } @Test - @SpecAssertions( - { @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "h"), @SpecAssertion(section = INTER_MODULE_INJECTION, id = "q") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "h"), + @SpecAssertion(section = INTER_MODULE_INJECTION, id = "q") }) public void testGetBeanClassCalled() { assert AfterBeanDiscoveryObserver.integerBean.isGetBeanClassCalled(); } @@ -98,7 +99,8 @@ public void testGetBindingsCalled() { } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "b"), @SpecAssertion(section = PASSIVATION_VALIDATION, id = "ga"), + @SpecAssertions({ @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "b"), + @SpecAssertion(section = PASSIVATION_VALIDATION, id = "ga"), @SpecAssertion(section = PASSIVATION_VALIDATION, id = "gb") }) public void testGetInjectionPointsCalled(Bar bar) { assert AfterBeanDiscoveryObserver.integerBean.isGetInjectionPointsCalled(); @@ -139,11 +141,11 @@ public void testCustomBeanIsPassivationCapableDependency() throws IOException, C @Test @SpecAssertion(section = INTER_MODULE_INJECTION, id = "r") - public void testInjectionPointGetMemberIsUsedToDetermineTheClassThatDeclaresAnInjectionPoint(){ + public void testInjectionPointGetMemberIsUsedToDetermineTheClassThatDeclaresAnInjectionPoint() { // resolve the bean and invoke a method on it to make sure it was created/used Foo foo = getContextualReference(Foo.class, new PassivableLiteral()); foo.getId(); - Assert.assertEquals(CustomInjectionPoint.getMembersClasses().size(),2); + Assert.assertEquals(CustomInjectionPoint.getMembersClasses().size(), 2); Assert.assertTrue(CustomInjectionPoint.getMembersClasses().contains(Bar.class)); Assert.assertTrue(CustomInjectionPoint.getMembersClasses().contains(Integer.class)); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomInjectionPoint.java index 0868ce727e..75e5cb70d1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomInjectionPoint.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -64,8 +64,8 @@ public Bean getBean() { @Override public Member getMember() { - membersClasses.add(annotatedField.getJavaMember().getType()); - return annotatedField.getJavaMember(); + membersClasses.add(annotatedField.getJavaMember().getType()); + return annotatedField.getJavaMember(); } @Override @@ -92,5 +92,4 @@ public static Set> getMembersClasses() { return membersClasses; } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Foo.java index fbc9425b99..0af9c85e72 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Foo.java @@ -15,6 +15,7 @@ import java.io.Serializable; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Inject; @@ -38,7 +39,4 @@ public long getId() { return id; } - - - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/FooBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/FooBean.java index 2408b0fb0f..0b8faeddea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/FooBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/FooBean.java @@ -18,6 +18,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; + import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.AnnotatedField; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/House.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/House.java index 01d2cff49c..4a7167a131 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/House.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/House.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Passivable.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Passivable.java index 6db0bd5e7a..63fea3687d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Passivable.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/Passivable.java @@ -1,33 +1,34 @@ -/* - * Copyright 2014, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.definition.bean.custom; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Passivable { - -} +/* + * Copyright 2014, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.definition.bean.custom; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Passivable { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivableLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivableLiteral.java index 3e0a16adb5..4c55780401 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivableLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivableLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivationCapableBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivationCapableBean.java index c4ce10481f..4fe2092347 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivationCapableBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/PassivationCapableBean.java @@ -14,9 +14,10 @@ package org.jboss.cdi.tck.tests.full.definition.bean.custom; import java.io.Serializable; + import jakarta.inject.Inject; -public class PassivationCapableBean implements Serializable{ +public class PassivationCapableBean implements Serializable { @Inject @Passivable diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/discovery/BeanDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/discovery/BeanDiscoveryTest.java index b9fbd37b1d..325e723fe6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/discovery/BeanDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/discovery/BeanDiscoveryTest.java @@ -24,6 +24,7 @@ import jakarta.enterprise.inject.spi.Extension; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -60,12 +61,14 @@ public static WebArchive createTestArchive() { JavaArchive alpha2 = ShrinkWrap .create(JavaArchive.class) .addClass(Alpha2.class) - .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).setBeansXmlVersion(BeansXmlVersion.v11), "beans.xml"); + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).setBeansXmlVersion(BeansXmlVersion.v11), + "beans.xml"); // beans.xml with version 2.0 and bean-discovery-mode of all JavaArchive alpha3 = ShrinkWrap .create(JavaArchive.class) .addClass(Alpha3.class) - .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).setBeansXmlVersion(BeansXmlVersion.v20), "beans.xml"); + .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).setBeansXmlVersion(BeansXmlVersion.v20), + "beans.xml"); // Empty beans.xml, since CDI 4.0 this is discovery mode "annotated" JavaArchive bravo = ShrinkWrap.create(JavaArchive.class).addClass(Bravo.class) .addAsManifestResource(new StringAsset(""), "beans.xml"); @@ -74,7 +77,7 @@ public static WebArchive createTestArchive() { .create(JavaArchive.class) .addClass(Charlie.class) // using null values enforces missing attribute in resulting XML file - .addAsManifestResource(new BeansXml().setBeansXmlVersion(null).setBeanDiscoveryMode(null),"beans.xml"); + .addAsManifestResource(new BeansXml().setBeansXmlVersion(null).setBeanDiscoveryMode(null), "beans.xml"); // Bean defining annotation and no beans.xml JavaArchive delta = ShrinkWrap.create(JavaArchive.class).addClasses(Delta.class, Golf.class, India.class, Kilo.class, Mike.class, Interceptor1.class, Decorator1.class); @@ -95,7 +98,8 @@ public static WebArchive createTestArchive() { LegacyBravo.class).addAsServiceProvider(Extension.class, LegacyExtension.class); return new WebArchiveBuilder().withTestClass(BeanDiscoveryTest.class) - .withClasses(VerifyingExtension.class, ScopesExtension.class, Binding.class, MyNormalScope.class, MyPseudoScope.class, + .withClasses(VerifyingExtension.class, ScopesExtension.class, Binding.class, MyNormalScope.class, + MyPseudoScope.class, MyNormalContext.class, MyPseudoContext.class, MyStereotype.class) .withExtensions(VerifyingExtension.class, ScopesExtension.class).withLibrary(Ping.class) .withLibraries(alpha, alpha2, alpha3, bravo, charlie, delta, echo, foxtrot, legacy).build(); @@ -105,19 +109,22 @@ public static WebArchive createTestArchive() { VerifyingExtension extension; @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) public void testExplicitBeanArchiveModeAll(Alpha alpha) { assertDiscoveredAndAvailable(alpha, Alpha.class); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) public void testExplicitBeanArchiveModeAllVersion11(Alpha2 alpha) { assertDiscoveredAndAvailable(alpha, Alpha2.class); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ba"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "a") }) public void testExplicitBeanArchiveModeAllVersion20(Alpha3 alpha) { assertDiscoveredAndAvailable(alpha, Alpha3.class); } @@ -138,7 +145,8 @@ public void testArchiveWithNoVersionBeansXml(Charlie charlie) { } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ca"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "b"), + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ca"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "b"), @SpecAssertion(section = BEAN_DEFINING_ANNOTATIONS, id = "ba"), @SpecAssertion(section = BEAN_DEFINING_ANNOTATIONS, id = "bb") }) public void testNormalScopeImplicitBeanArchiveNoDescriptor(Delta delta, Golf golf) { @@ -147,7 +155,8 @@ public void testNormalScopeImplicitBeanArchiveNoDescriptor(Delta delta, Golf gol } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ca"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "b"), + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE, id = "ca"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "b"), @SpecAssertion(section = BEAN_DEFINING_ANNOTATIONS, id = "ba"), @SpecAssertion(section = BEAN_DEFINING_ANNOTATIONS, id = "bb") }) public void testNormalScopeImplicitBeanArchiveModeAnnotated(Echo echo, Hotel hotel) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/exclude/ExcludeFiltersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/exclude/ExcludeFiltersTest.java index 95a580f1bd..9a48ac473c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/exclude/ExcludeFiltersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/exclude/ExcludeFiltersTest.java @@ -56,15 +56,19 @@ public static WebArchive createTestArchive() { .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL).excludeFilters( BeansXml.Exclude.match(Chonmage.class.getPackage().getName() + ".*"), BeansXml.Exclude.match(Mustache.class.getPackage().getName() + ".**"), - BeansXml.Exclude.match(Meat.class.getPackage().getName() + ".*").ifClassAvailable("com.some.unreal.class.Name"), - BeansXml.Exclude.match(Meat.class.getPackage().getName() + ".*").ifClassNotAvailable(ExcludeFiltersTest.class.getName()), + BeansXml.Exclude.match(Meat.class.getPackage().getName() + ".*") + .ifClassAvailable("com.some.unreal.class.Name"), + BeansXml.Exclude.match(Meat.class.getPackage().getName() + ".*") + .ifClassNotAvailable(ExcludeFiltersTest.class.getName()), BeansXml.Exclude.match(Alpha.class.getName()).ifClassAvailable(Stubble.class.getName()), BeansXml.Exclude.match(Stubble.class.getName()), BeansXml.Exclude.match(Foxtrot.class.getName()).ifClassAvailable("com.some.unreal.class.Name"), BeansXml.Exclude.match(Bravo.class.getName()).ifClassNotAvailable("com.some.unreal.class.Name"), BeansXml.Exclude.match(Echo.class.getName()).ifClassNotAvailable(ExcludeFiltersTest.class.getName()), - BeansXml.Exclude.match(Charlie.class.getName()).ifSystemProperty(TestSystemProperty.EXCLUDE_DUMMY.getKey()), - BeansXml.Exclude.match(Delta.class.getName()).ifSystemProperty(TestSystemProperty.EXCLUDE_DUMMY.getKey(), TestSystemProperty.EXCLUDE_DUMMY.getValue()) + BeansXml.Exclude.match(Charlie.class.getName()) + .ifSystemProperty(TestSystemProperty.EXCLUDE_DUMMY.getKey()), + BeansXml.Exclude.match(Delta.class.getName()).ifSystemProperty( + TestSystemProperty.EXCLUDE_DUMMY.getKey(), TestSystemProperty.EXCLUDE_DUMMY.getValue()) )) .withExtension(VerifyingExtension.class).build(); } @@ -73,7 +77,8 @@ public static WebArchive createTestArchive() { VerifyingExtension extension; @Test - @SpecAssertions({ @SpecAssertion(section = EXCLUDE_FILTERS, id = "a"), @SpecAssertion(section = EXCLUDE_FILTERS, id = "f") }) + @SpecAssertions({ @SpecAssertion(section = EXCLUDE_FILTERS, id = "a"), + @SpecAssertion(section = EXCLUDE_FILTERS, id = "f") }) public void testTypeFcqnMatchesExcludeFilterName() { assertTypeIsExcluded(Stubble.class); assertTypeIsNotExcluded(Golf.class); @@ -89,7 +94,8 @@ public void testTypePackageMatchesExcludeFilterName() { } @Test - @SpecAssertions({ @SpecAssertion(section = EXCLUDE_FILTERS, id = "b"), @SpecAssertion(section = EXCLUDE_FILTERS, id = "c") }) + @SpecAssertions({ @SpecAssertion(section = EXCLUDE_FILTERS, id = "b"), + @SpecAssertion(section = EXCLUDE_FILTERS, id = "c") }) public void testExcludeClassActivators() { assertTypeIsExcluded(Alpha.class); assertTypeIsNotExcluded(Foxtrot.class); @@ -99,7 +105,8 @@ public void testExcludeClassActivators() { } @Test(groups = { INTEGRATION, SYSTEM_PROPERTIES, CDI_FULL }) - @SpecAssertions({ @SpecAssertion(section = EXCLUDE_FILTERS, id = "d"), @SpecAssertion(section = EXCLUDE_FILTERS, id = "e") }) + @SpecAssertions({ @SpecAssertion(section = EXCLUDE_FILTERS, id = "d"), + @SpecAssertion(section = EXCLUDE_FILTERS, id = "e") }) public void testExcludeSystemPropertyActivator() { assertTypeIsExcluded(Charlie.class); assertTypeIsExcluded(Delta.class); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/initialization/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/initialization/Foo.java index 2f1146f846..affeece4a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/initialization/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/initialization/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.full.deployment.initialization; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.ActionSequence; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/BikeProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/BikeProducer.java index e859852d7c..b6f9a6cd10 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/BikeProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/BikeProducer.java @@ -18,7 +18,7 @@ public class BikeProducer { @Produces - public Bike createBike(){ + public Bike createBike() { return new Bike(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Popular.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Popular.java index 8500c75c28..06e0b2f0d5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Popular.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Popular.java @@ -17,6 +17,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Stereotype; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Segway.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Segway.java index 77dba8582c..1109a7aae5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Segway.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/Segway.java @@ -16,7 +16,7 @@ @Popular public class Segway { - void start(){ + void start() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/TestExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/TestExtension.java index 4cc7066e83..6b05ee776d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/TestExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/deployment/trimmed/TestExtension.java @@ -15,6 +15,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.ProcessAnnotatedType; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Delivery.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Delivery.java index 8c269e8ea4..e3332befcc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Delivery.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Delivery.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/EventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/EventTest.java index d0d5db2cea..b431225892 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/EventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/EventTest.java @@ -37,7 +37,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = SPECIALIZATION, id = "cc"), @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "baa") }) + @SpecAssertions({ @SpecAssertion(section = SPECIALIZATION, id = "cc"), + @SpecAssertion(section = OBSERVERS_METHOD_INVOCATION, id = "baa") }) public void testObserverCalledOnSpecializedBeanOnly() { Shop.observers.clear(); getCurrentManager().getEvent().select(Delivery.class).fire(new Delivery()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/FarmShop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/FarmShop.java index b072eebccd..803bd595f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/FarmShop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/FarmShop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Shop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Shop.java index e19e23fa4d..bae1e72d36 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Shop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/Shop.java @@ -6,19 +6,19 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.event; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.event.Observes; - import java.util.HashSet; import java.util.Set; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; + @Dependent public class Shop { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/AfterBeanDiscoveryObserver.java index 377eeca89c..419b699322 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Bar.java index 4bffe1512f..7af8bc1c73 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Bar.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ public class Bar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Baz.java index acb8ee8b23..0e78aa1518 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/Baz.java @@ -16,11 +16,12 @@ import jakarta.enterprise.event.Event; import jakarta.inject.Inject; + import org.jboss.cdi.tck.tests.event.broken.raw.Foo; /** * @author Martin Kouba - * + * */ public class Baz { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomBarBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomBarBean.java index 656707bc87..e25c7b5220 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomBarBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomBarBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomEventInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomEventInjectionPoint.java index 66f622f15f..9a47122c8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomEventInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/CustomEventInjectionPoint.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/ProcessInjectionPointObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/ProcessInjectionPointObserver.java index cbac9d9d27..d09c060d66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/ProcessInjectionPointObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/ProcessInjectionPointObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventCustomBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventCustomBeanTest.java index 1c433f3de2..956bbc4a6a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventCustomBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventCustomBeanTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventProcessInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventProcessInjectionPointTest.java index 3d376672ed..aae53007d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventProcessInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/broken/raw/RawEventProcessInjectionPointTest.java @@ -34,7 +34,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/FireEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/FireEventTest.java index 6d44c130ae..81589c8a88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/FireEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/fires/FireEventTest.java @@ -31,7 +31,8 @@ public class FireEventTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClassPackage(FireEventTest.class).withClass(ContainerLifecycleEvents.class).build(); + return new WebArchiveBuilder().withTestClassPackage(FireEventTest.class).withClass(ContainerLifecycleEvents.class) + .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/AbstractObserverNotificationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/AbstractObserverNotificationTest.java index c227295d7a..45348a401f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/AbstractObserverNotificationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/AbstractObserverNotificationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Angry.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Angry.java index 423bac4e9a..b675cb4f0d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Angry.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Angry.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/BeanManagerObserverNotificationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/BeanManagerObserverNotificationTest.java index 0938875338..7ea17a32c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/BeanManagerObserverNotificationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/BeanManagerObserverNotificationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,7 +34,7 @@ *

      * This test was originally part of Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -54,7 +54,8 @@ public void fireEvent(Giraffe payload, Annotation... qualifiers) { } @Test(groups = CDI_FULL) - @SpecAssertions({ @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "fb"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "eb"), + @SpecAssertions({ @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "fb"), + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "eb"), @SpecAssertion(section = OBSERVER_RESOLUTION, id = "k") }) public void testNotifyInvoked() { testNotifyInvokedInternal(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/EventBeanObserverNotificationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/EventBeanObserverNotificationTest.java index 96a77ae270..5a2e73c11d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/EventBeanObserverNotificationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/EventBeanObserverNotificationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,10 +38,10 @@ *

      * This test was originally part of Weld test suite. *

      - * + * * Note that we have to declare test methods on test class (not abstract superclass) because of the way we analyze assertions * coverage. - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -66,7 +66,8 @@ protected void fireEvent(Giraffe payload, Annotation... qualifiers) { } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "fb"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "eb"), + @SpecAssertions({ @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "fb"), + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "eb"), @SpecAssertion(section = OBSERVER_RESOLUTION, id = "k") }) public void testNotifyInvoked() { testNotifyInvokedInternal(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Giraffe.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Giraffe.java index f077f9e4b7..5599f609d1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Giraffe.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Giraffe.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/GiraffeObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/GiraffeObserver.java index d42dc5f768..619a2bb75a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/GiraffeObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/GiraffeObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Nubian.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Nubian.java index de68602b2f..5d90f32355 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Nubian.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Nubian.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/ObserverExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/ObserverExtension.java index 2fc2a882ee..d32295eaaf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/ObserverExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/ObserverExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,8 @@ public class ObserverExtension implements Extension { private GiraffeObserver anyGiraffeObserver = new GiraffeObserver(Any.Literal.INSTANCE); private GiraffeObserver fiveMeterTallGiraffeObserver = new GiraffeObserver(Tall.Literal.FIVE_METERS); - private GiraffeObserver sixMeterTallAngryGiraffeObserver = new GiraffeObserver(Tall.Literal.SIX_METERS, new Angry.Literal()); + private GiraffeObserver sixMeterTallAngryGiraffeObserver = new GiraffeObserver(Tall.Literal.SIX_METERS, + new Angry.Literal()); private GiraffeObserver angryNubianGiraffeObserver = new GiraffeObserver(new Angry.Literal(), new Nubian.Literal()); public void registerObservers(@Observes AfterBeanDiscovery event) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Tall.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Tall.java index b010fef0e7..e3db2d7f86 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Tall.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/extension/Tall.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/EventObserverOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/EventObserverOrderingTest.java index b6c43687c2..fdc11e7f7f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/EventObserverOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/EventObserverOrderingTest.java @@ -19,6 +19,7 @@ import static org.testng.Assert.assertEquals; import jakarta.enterprise.inject.spi.ObserverMethod; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -43,14 +44,17 @@ public static WebArchive createTestArchive() { } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = OBSERVER_ORDERING, id = "a"), @SpecAssertion(section = OBSERVER_METHOD, id = "ea") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVER_ORDERING, id = "a"), + @SpecAssertion(section = OBSERVER_METHOD, id = "ea") }) public void testDefaultPriority(ObserverExtension observerExtension) { - assertEquals(observerExtension.getObserverMethodPriority("Observer2.observeMoon").intValue(), ObserverMethod.DEFAULT_PRIORITY); + assertEquals(observerExtension.getObserverMethodPriority("Observer2.observeMoon").intValue(), + ObserverMethod.DEFAULT_PRIORITY); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ @SpecAssertion(section = OBSERVER_METHOD, id = "ea") }) public void testProcessObserverMethodPriority(ObserverExtension observerExtension) { - assertEquals(observerExtension.getObserverMethodPriority("Observer3.observeMoon").intValue(), ObserverMethod.DEFAULT_PRIORITY + 400); + assertEquals(observerExtension.getObserverMethodPriority("Observer3.observeMoon").intValue(), + ObserverMethod.DEFAULT_PRIORITY + 400); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/MoonObservers.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/MoonObservers.java index d59ccd1246..232ec45168 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/MoonObservers.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/MoonObservers.java @@ -17,6 +17,7 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.event.Observes; import jakarta.interceptor.Interceptor; + import org.jboss.cdi.tck.util.ActionSequence; public class MoonObservers { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/Moonrise.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/Moonrise.java index 8a83adc724..ef4a75cdf0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/Moonrise.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/Moonrise.java @@ -13,7 +13,6 @@ */ package org.jboss.cdi.tck.tests.full.event.observer.priority; - public class Moonrise extends MoonActivity { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/ObserverExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/ObserverExtension.java index 9c7f0124c9..7c0135b990 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/ObserverExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/event/observer/priority/ObserverExtension.java @@ -6,21 +6,21 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.event.observer.priority; +import java.util.HashMap; +import java.util.Map; + import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.ObserverMethod; import jakarta.enterprise.inject.spi.ProcessObserverMethod; -import java.util.HashMap; -import java.util.Map; - public class ObserverExtension implements Extension { private final Map observerMethodPriorities = new HashMap<>(); @@ -28,7 +28,8 @@ public class ObserverExtension implements Extension { public void registerObservers(@Observes ProcessObserverMethod processObserverMethod) { ObserverMethod observerMethod = processObserverMethod.getObserverMethod(); - String id = observerMethod.getBeanClass().getSimpleName() + "." + processObserverMethod.getAnnotatedMethod().getJavaMember().getName(); + String id = observerMethod.getBeanClass().getSimpleName() + "." + + processObserverMethod.getAnnotatedMethod().getJavaMember().getName(); observerMethodPriorities.put(id, observerMethod.getPriority()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java index 3c748a060f..ff239e947e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java index f44099bc59..556b08156e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -59,7 +59,8 @@ public void testCustomDependentBeanInjectionPointIsAvailable(Cage cage) { } @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "da"), @SpecAssertion(section = PROCESS_BEAN, id = "eca") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "da"), + @SpecAssertion(section = PROCESS_BEAN, id = "eca") }) public void testProcessBeanIsFired() { assertEquals(getCurrentManager().getExtension(AfterBeanDiscoveryObserver.class).getCockatooPBObservedCount().get(), 1); assertEquals(getCurrentManager().getExtension(AfterBeanDiscoveryObserver.class).getCockatooPSBObservedCount().get(), 1); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Cockatoo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Cockatoo.java index f8bf805158..2d325f288a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Cockatoo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Cockatoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Listener.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Listener.java index e13e74a9e8..7cf696e712 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Listener.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/Listener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperContext.java index 7bb2022346..6cfa423bc6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperContext.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperScoped.java index 5a5ca94720..5b360dd172 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/SuperScoped.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/annotated/ModifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/annotated/ModifyingExtension.java index defa2146d6..5447f3b353 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/annotated/ModifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/afterBeanDiscovery/annotated/ModifyingExtension.java @@ -83,7 +83,8 @@ public String getBaseId() { @Override public AnnotatedType delegate() { - return new AnnotatedTypeWrapper(beanManager.createAnnotatedType(Foo.class), false, CharlieLiteral.INSTANCE); + return new AnnotatedTypeWrapper(beanManager.createAnnotatedType(Foo.class), false, + CharlieLiteral.INSTANCE); } }.perform(event); @@ -105,7 +106,8 @@ public void observeProcessAnnotatedType(@Observes ProcessAnnotatedType even /** * Store the result, don't verify anything since it's more transparent to have assertions in the test class methods. * - * The methods {@link AfterBeanDiscovery#getAnnotatedType(Class, String)} and {@link AfterBeanDiscovery#getAnnotatedTypes(Class)} will be + * The methods {@link AfterBeanDiscovery#getAnnotatedType(Class, String)} and + * {@link AfterBeanDiscovery#getAnnotatedTypes(Class)} will be * probably placed on the {@link AfterBeanDiscovery}. See also CDI-83. * * @param event diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java index 90b643a8f2..26ddef277a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/deployment/AlternativeInLibraryWithExtensionTest.java @@ -20,6 +20,7 @@ import static org.jboss.cdi.tck.cdi.Sections.INITIALIZATION; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -54,11 +55,13 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(AlternativeInLibraryWithExtensionTest.class) .withBeanLibrary(new BeansXml().alternatives(BarAlternative.class), - Foo.class, Bar.class, BarAlternative.class, NoopExtension.class).build(); + Foo.class, Bar.class, BarAlternative.class, NoopExtension.class) + .build(); } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "ba"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), + @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "ba"), @SpecAssertion(section = INITIALIZATION, id = "b") }) public void testAlternative() { Assert.assertEquals("barAlternative", foo.getBar().ping()); 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 6dbd8db0d8..6a3470abd7 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 @@ -20,11 +20,14 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.lang.annotation.Annotation; +import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; -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.ProducesLiteral; @@ -36,9 +39,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Annotation; -import java.util.Set; - /** * This test class contains tests for adding meta data using extensions. * @@ -85,13 +85,15 @@ public void testGetBaseTypeUsedToDetermineTypeOfConstructorInjectionPoint() { TropicalFruit.class); assertTrue(MarketWrapper.isGetBaseTypeOfMarketConstructorParameterUsed()); // s assertion - assertTrue(getContextualReference(Market.class).getConstructorFruit().getMetadata().getQualifiers().contains(Any.Literal.INSTANCE)); + assertTrue(getContextualReference(Market.class).getConstructorFruit().getMetadata().getQualifiers() + .contains(Any.Literal.INSTANCE)); } @Test @SpecAssertion(section = ALTERNATIVE_METADATA_SOURCES, id = "hd") public void testGetBaseTypeUsedToDetermineTypeOfProducerInjectionPoint() { - assertEquals(getContextualReference(Bill.class, new ExpensiveLiteral()).getFruit().getMetadata().getType(), TropicalFruit.class); + assertEquals(getContextualReference(Bill.class, new ExpensiveLiteral()).getFruit().getMetadata().getType(), + TropicalFruit.class); assertTrue(MarketWrapper.isGetBaseTypeOfBillProducerParameterUsed()); } @@ -117,7 +119,8 @@ public void testGetBaseTypeUsedToDetermineTypeOfDisposerInjectionPoint() { TropicalFruit.class); assertTrue(GroceryWrapper.isGetBaseTypeOfBillDisposerParameterUsed()); // ad assertion - assertTrue(getContextualReference(Grocery.class, Any.Literal.INSTANCE).getDisposerFruit().getMetadata().getQualifiers().contains(Any.Literal.INSTANCE)); + assertTrue(getContextualReference(Grocery.class, Any.Literal.INSTANCE).getDisposerFruit().getMetadata().getQualifiers() + .contains(Any.Literal.INSTANCE)); } @Test @@ -248,7 +251,8 @@ public void testInjectCreatesInitializerMethod() { @SpecAssertion(section = ALTERNATIVE_METADATA_SOURCES, id = "x") public void testQualifierAddedToInitializerParameter() { // The @Cheap qualifier is added to the method parameter - Set qualifiers = getContextualReference(Grocery.class, Any.Literal.INSTANCE).getInitializerFruit().getMetadata() + Set qualifiers = getContextualReference(Grocery.class, Any.Literal.INSTANCE).getInitializerFruit() + .getMetadata() .getQualifiers(); assertTrue(annotationSetMatches(qualifiers, Cheap.class)); } @@ -291,7 +295,8 @@ public void testDisposesIsAppliedToMethodParameter() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = ALTERNATIVE_METADATA_SOURCES, id = "ae"), @SpecAssertion(section = ALTERNATIVE_METADATA_SOURCES, id = "ag") }) + @SpecAssertions({ @SpecAssertion(section = ALTERNATIVE_METADATA_SOURCES, id = "ae"), + @SpecAssertion(section = ALTERNATIVE_METADATA_SOURCES, id = "ag") }) public void testObserverMethod() { getCurrentManager().getEvent().select(Milk.class).fire(new Milk(true)); Milk event = getContextualReference(Grocery.class, Any.Literal.INSTANCE).getObserverEvent(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bill.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bill.java index ed8f6cfe07..c4bdf466a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bill.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bill.java @@ -17,7 +17,7 @@ public class Bill { private Fruit fruit; - public Bill(Fruit fruit){ + public Bill(Fruit fruit) { this.fruit = fruit; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bread.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bread.java index a1acfab455..693f95e9cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bread.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Bread.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 ac99a6032f..82f9951251 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/CheapLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/CheapLiteral.java index 9812a61503..8c853dc437 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/CheapLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/CheapLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 dfcb6e8a05..f23f74f630 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ExpensiveLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ExpensiveLiteral.java index 896c8e2889..a8bd0df1d9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ExpensiveLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ExpensiveLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Fruit.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Fruit.java index ca25269d12..d2b2f196df 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Fruit.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Fruit.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Grocery.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Grocery.java index 6eac97d297..54bbd5d552 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Grocery.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Grocery.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -124,8 +124,8 @@ public void destroyVegetable(@Disposes Vegetables vegetables) { wrappedDisposalParameter = vegetables; } - public void destroyYogurt(Yogurt yogurt){ - disposerMethodCalled = true; + public void destroyYogurt(Yogurt yogurt) { + disposerMethodCalled = true; }; public boolean isWaterInjected() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptor.java index 80ff8ae6cd..f2d724e434 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/GroceryInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 45fa3c265a..2e3bfb2b7b 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 b3cfeefff6..aad139018f 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 @@ -6,33 +6,32 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.extensions.alternative.metadata; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.event.Reception; import jakarta.enterprise.event.TransactionPhase; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; import jakarta.enterprise.inject.literal.InjectLiteral; import jakarta.enterprise.inject.spi.AnnotatedConstructor; import jakarta.enterprise.inject.spi.AnnotatedField; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedParameter; import jakarta.enterprise.inject.spi.AnnotatedType; -import jakarta.enterprise.util.AnnotationLiteral; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.ArrayList; -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; @@ -69,11 +68,13 @@ public Set> getConstructors() { Set> constructors = new HashSet>(); for (AnnotatedConstructor constructor : super.getConstructors()) { if (constructor.getParameters().size() == 1) { - AnnotatedConstructorWrapper constructorWrapper = new AnnotatedConstructorWrapper(constructor, this, true, + AnnotatedConstructorWrapper constructorWrapper = new AnnotatedConstructorWrapper(constructor, + this, true, new InjectLiteral()); constructors.add(constructorWrapper); } else { - AnnotatedConstructorWrapper constructorWrapper = new AnnotatedConstructorWrapper(constructor, this, true); + AnnotatedConstructorWrapper constructorWrapper = new AnnotatedConstructorWrapper(constructor, + this, true); constructors.add(constructorWrapper); } } @@ -109,7 +110,8 @@ public Set> getMethods() { 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(), + AnnotatedMethodWrapper wrappedMethod = new AnnotatedMethodWrapper(method, this, false, + new ExpensiveLiteral(), ProducesLiteral.INSTANCE); methods.add(wrapMethodParameters(method.getParameters(), wrappedMethod, false, new CheapLiteral())); } else if (method.getJavaMember().getName().equals("nonInjectAnnotatedInitializer")) { @@ -120,14 +122,15 @@ public Set> getMethods() { AnnotatedMethodWrapper methodWrapper = new AnnotatedMethodWrapper(method, this, true); - methodWrapper.replaceParameters(new AnnotatedParameterWrapper(method.getParameters().get(0), methodWrapper, false, - new CheapLiteral()) { - @Override - public Type getBaseType() { - getBaseTypeOfInitializerTropicalFruitParameterUsed = true; - return TropicalFruit.class; - } - }); + methodWrapper + .replaceParameters(new AnnotatedParameterWrapper(method.getParameters().get(0), methodWrapper, false, + new CheapLiteral()) { + @Override + public Type getBaseType() { + getBaseTypeOfInitializerTropicalFruitParameterUsed = true; + return TropicalFruit.class; + } + }); methods.add(methodWrapper); } else if (method.getJavaMember().getName().equals("observer1")) { @@ -153,7 +156,8 @@ public Class annotationType() { methods.add(wrapMethodParameters(method.getParameters(), methodWrapper, true, new ExpensiveLiteral())); } else if (method.getJavaMember().getName().equals("observerMilk")) { AnnotatedMethodWrapper methodWrapper = new AnnotatedMethodWrapper(method, this, true); - methodWrapper.replaceParameters(new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true), + methodWrapper.replaceParameters( + new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true), new AnnotatedParameterWrapper(methodWrapper.getParameter(1), methodWrapper, true) { @Override public Type getBaseType() { @@ -165,8 +169,10 @@ public Type getBaseType() { } else if (method.getJavaMember().getName().equals("destroyBill")) { AnnotatedMethodWrapper methodWrapper = new AnnotatedMethodWrapper(method, this, true); // replace the second parameter and keep the first one - methodWrapper.replaceParameters(new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true), - new AnnotatedParameterWrapper(methodWrapper.getParameter(1), methodWrapper, true, Any.Literal.INSTANCE) { + methodWrapper.replaceParameters( + new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true), + new AnnotatedParameterWrapper(methodWrapper.getParameter(1), methodWrapper, true, + Any.Literal.INSTANCE) { @Override public Type getBaseType() { getBaseTypeOfBillDisposerParameterUsed = true; @@ -177,23 +183,25 @@ public Type getBaseType() { } else if (method.getJavaMember().getName().equals("observesVegetable")) { AnnotatedMethodWrapper methodWrapper = new AnnotatedMethodWrapper(method, this, true); - methodWrapper.replaceParameters(new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true) { - @Override - public Type getBaseType() { - getBaseTypeOfObserverParameterUsed = true; - return Carrot.class; - } - }); + methodWrapper + .replaceParameters(new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true) { + @Override + public Type getBaseType() { + getBaseTypeOfObserverParameterUsed = true; + return Carrot.class; + } + }); methods.add(methodWrapper); } else if (method.getJavaMember().getName().equals("destroyVegetable")) { AnnotatedMethodWrapper methodWrapper = new AnnotatedMethodWrapper(method, this, true); - methodWrapper.replaceParameters(new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true, new CheapLiteral()) { - @Override - public Type getBaseType() { - return Carrot.class; - } - }); + methodWrapper.replaceParameters( + new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true, new CheapLiteral()) { + @Override + public Type getBaseType() { + return Carrot.class; + } + }); methods.add(methodWrapper); } else if (method.getJavaMember().getName().equals("destroyYogurt")) { @@ -227,11 +235,13 @@ public Set getTypeClosure() { return methods; } - private AnnotatedFieldWrapper wrapField(AnnotatedField delegate, AnnotatedTypeWrapper declaringType, Annotation... annotations) { + private AnnotatedFieldWrapper wrapField(AnnotatedField delegate, AnnotatedTypeWrapper declaringType, + Annotation... annotations) { return new AnnotatedFieldWrapper(delegate, declaringType, false, annotations); } - private AnnotatedFieldWrapper wrapFruitField(AnnotatedField delegate, AnnotatedTypeWrapper declaringType, Annotation... annotations) { + private AnnotatedFieldWrapper wrapFruitField(AnnotatedField delegate, + AnnotatedTypeWrapper declaringType, Annotation... annotations) { return new AnnotatedFieldWrapper(delegate, declaringType, true, annotations) { @Override public Type getBaseType() { @@ -258,12 +268,14 @@ public Set getTypeClosure() { * This method allows you to add a set of Annotations to every method parameter. Note that the method will remove all * method-level annotations. */ - private AnnotatedMethodWrapper wrapMethodParameters(List> params, AnnotatedMethodWrapper declaringMethod, + private AnnotatedMethodWrapper wrapMethodParameters(List> params, + AnnotatedMethodWrapper declaringMethod, final boolean keepOriginalAnnotations, final Annotation... annotations) { List> wrappedParams = new ArrayList>(); for (AnnotatedParameter param : params) { - wrappedParams.add(new AnnotatedParameterWrapper(param, declaringMethod, keepOriginalAnnotations, annotations[param.getPosition()])); + wrappedParams.add(new AnnotatedParameterWrapper(param, declaringMethod, keepOriginalAnnotations, + annotations[param.getPosition()])); } declaringMethod.replaceParameters(wrappedParams.toArray(new AnnotatedParameter[wrappedParams.size()])); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/MarketWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/MarketWrapper.java index 808d25f7b2..ffbf005b6c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/MarketWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/MarketWrapper.java @@ -13,17 +13,18 @@ */ package org.jboss.cdi.tck.tests.full.extensions.alternative.metadata; -import org.jboss.cdi.tck.util.annotated.*; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.HashSet; +import java.util.Set; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.AnnotatedConstructor; import jakarta.enterprise.inject.spi.AnnotatedField; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedType; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.HashSet; -import java.util.Set; + +import org.jboss.cdi.tck.util.annotated.*; public class MarketWrapper extends AnnotatedTypeWrapper { @@ -93,31 +94,35 @@ public Set> getMethods() { return methods; } - public AnnotatedMethodWrapper wrapMethodParameter(AnnotatedMethod delegate, boolean keepOriginalAnnotations) { + public AnnotatedMethodWrapper wrapMethodParameter(AnnotatedMethod delegate, + boolean keepOriginalAnnotations) { AnnotatedMethodWrapper methodWrapper = new AnnotatedMethodWrapper(delegate, this, keepOriginalAnnotations); - methodWrapper.replaceParameters(new AnnotatedParameterWrapper(methodWrapper.getParameter(0),methodWrapper, true) { - @Override - public Type getBaseType() { - getBaseTypeOfBillProducerParameterUsed = true; - return TropicalFruit.class; - } - }); + methodWrapper + .replaceParameters(new AnnotatedParameterWrapper(methodWrapper.getParameter(0), methodWrapper, true) { + @Override + public Type getBaseType() { + getBaseTypeOfBillProducerParameterUsed = true; + return TropicalFruit.class; + } + }); return methodWrapper; } - private AnnotatedConstructor wrapConstructor - (AnnotatedConstructor delegate, final boolean keepOriginalAnnotations, final Annotation... annotations) { - AnnotatedConstructorWrapper constructor = new AnnotatedConstructorWrapper(delegate, this, keepOriginalAnnotations, annotations); - constructor.replaceParameters(new AnnotatedParameterWrapper(constructor.getParameter(0),constructor, keepOriginalAnnotations, annotations) { - @Override - public Type getBaseType() { - getBaseTypeOfMarketConstructorParameterUsed = true; - return TropicalFruit.class; - } + private AnnotatedConstructor wrapConstructor(AnnotatedConstructor delegate, + final boolean keepOriginalAnnotations, final Annotation... annotations) { + AnnotatedConstructorWrapper constructor = new AnnotatedConstructorWrapper(delegate, this, + keepOriginalAnnotations, annotations); + constructor.replaceParameters( + new AnnotatedParameterWrapper(constructor.getParameter(0), constructor, keepOriginalAnnotations, annotations) { + @Override + public Type getBaseType() { + getBaseTypeOfMarketConstructorParameterUsed = true; + return TropicalFruit.class; + } - }); + }); return constructor; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Milk.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Milk.java index db35f34b4f..8620bb4818 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Milk.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Milk.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 00361a1a40..91b0217a0d 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ProcessAnnotatedTypeObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ProcessAnnotatedTypeObserver.java index b52805dcf5..0466c13e18 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ProcessAnnotatedTypeObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/ProcessAnnotatedTypeObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Sausage.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Sausage.java index b9199182eb..97d6356356 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Sausage.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Sausage.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Shop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Shop.java index f2e31bd380..a4d87cec25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Shop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Shop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/TropicalFruit.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/TropicalFruit.java index 858994ae29..6a1aa37b05 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/TropicalFruit.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/TropicalFruit.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Vegetables.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Vegetables.java index 3a4f9733c7..0ecf1f2fef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Vegetables.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Vegetables.java @@ -6,13 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.extensions.alternative.metadata; -public interface Vegetables { +public interface Vegetables { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Water.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Water.java index 9330e3b10b..2270a2edc6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Water.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Water.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Yogurt.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Yogurt.java index 28184c5e46..b11f06226f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Yogurt.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/Yogurt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/AnnotatedTypeAnnotationsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/AnnotatedTypeAnnotationsTest.java index 0691d62a1a..6e3f89077a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/AnnotatedTypeAnnotationsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/AnnotatedTypeAnnotationsTest.java @@ -40,7 +40,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) @@ -77,7 +77,8 @@ public void testProcessAnnotatedType() { AnnotatedType rimmer = extension.getRimmer(); assertNotNull(rimmer); - assertAnnotationSetMatches(rimmer.getAnnotations(), Mortal.class, Dependent.class, InheritedQualifier.class, Fate.class); + assertAnnotationSetMatches(rimmer.getAnnotations(), Mortal.class, Dependent.class, InheritedQualifier.class, + Fate.class); } @SuppressWarnings("unchecked") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/ObservingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/ObservingExtension.java index 047196271a..76dc9f5476 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/ObservingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/annotated/ObservingExtension.java @@ -47,7 +47,8 @@ public void observeRimmer(@Observes ProcessAnnotatedType event) { /** * Store the result, don't verify anything since it's more transparent to have assertions in the test class methods. * - * The methods {@link AfterBeanDiscovery#getAnnotatedType(Class, String)} and {@link AfterBeanDiscovery#getAnnotatedTypes(Class)} will be + * The methods {@link AfterBeanDiscovery#getAnnotatedType(Class, String)} and + * {@link AfterBeanDiscovery#getAnnotatedTypes(Class)} will be * probably placed on the {@link AfterBeanDiscovery}. See also CDI-83. * * @param event diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java index deaf2ec9f4..24f6db6ad1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/AlternativeMetadataInterceptorTest.java @@ -31,10 +31,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; - /** * This test class contains tests for adding meta data using extensions. - * + * * @author Matej Briskar */ @SpecVersion(spec = "cdi", version = "2.0") @@ -44,7 +43,8 @@ public class AlternativeMetadataInterceptorTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(AlternativeMetadataInterceptorTest.class) - .withClasses(InterceptorExtension.class, Login.class, LoginInterceptor.class, LoginInterceptorBinding.class, Secured.class) + .withClasses(InterceptorExtension.class, Login.class, LoginInterceptor.class, LoginInterceptorBinding.class, + Secured.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL).interceptors(LoginInterceptor.class)) .withExtension(InterceptorExtension.class).build(); } @@ -65,6 +65,4 @@ public void testInterceptorInterceptsOnlyBindedClass() { assertEquals(securedLogin.login(), "intercepted"); } - } - 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 5f8d2a5de7..db5ddc13ca 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 @@ -26,7 +26,6 @@ import org.jboss.cdi.tck.util.ForwardingAnnotatedType; - public class InterceptorExtension implements Extension { public void registerAdditionalLoginAnnotatedType(@Observes BeforeBeanDiscovery event, BeanManager manager) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptor.java index 878d9c4a2b..5720608167 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/alternative/metadata/interceptor/LoginInterceptor.java @@ -17,7 +17,6 @@ import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; - @Interceptor @LoginInterceptorBinding public class LoginInterceptor { 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 be1d236fc1..2fb8b9a723 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,7 +26,6 @@ import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; - @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AbstractC.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AbstractC.java index dbfe5ec232..6e62f11253 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AbstractC.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AbstractC.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AlternativeMetaDataTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AlternativeMetaDataTest.java index 4cb1cad04f..bdef9eda9a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AlternativeMetaDataTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/AlternativeMetaDataTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -46,7 +46,7 @@ * Contains all the functioning tests for the extension which provides alternative meta data sources. Some of the assertions are * really statements of intent, but are tested here to make sure the container provides implementations that meet that same * intent as any third party extension would. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Animal.java index 820d673536..65256b3a2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Animal.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public interface Animal { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Cat.java index 854b64f1d6..cd3fc573cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ClassD.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ClassD.java index 4f659c8ba7..cc1546774e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ClassD.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ClassD.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Dog.java index 5f7d04e10f..53823b4d20 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/DogHouse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/DogHouse.java index 40b8ef7911..1b4d68bb9a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/DogHouse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/DogHouse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Felid.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Felid.java index 9624154489..08a181f37b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Felid.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Felid.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceA.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceA.java index a0f23a3ad8..7ae130fe34 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceA.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceA.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceB.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceB.java index 16fb815a8d..e83506b2cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceB.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/InterfaceB.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeObserver.java index 48aaff4354..04a28cac06 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeTest.java index f314c66add..6b97a24e34 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/ProcessAnnotatedTypeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -41,7 +41,7 @@ /** * Tests for the extensions provided by the ProcessAnnotatedType events. - * + * * @author David Allen * @author Jozef Hartinger * @author Martin Kouba @@ -58,8 +58,10 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "aa"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ab"), - @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "c"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "j") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "aa"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ab"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "c"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "j") }) public void testProcessAnnotatedTypeEventsSent() { // Randomly test some of the classes and interfaces that should have // been discovered and sent via the event @@ -91,7 +93,8 @@ public void testGetAnnotatedType() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "bb"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ca") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "bb"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ca") }) public void testSetAnnotatedType() { assertTrue(TestAnnotatedType.isGetConstructorsUsed()); assertTrue(TestAnnotatedType.isGetFieldsUsed()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Tame.java index 97ee47318b..601d130f90 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/TestAnnotatedType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/TestAnnotatedType.java index dc268d23f8..892bcada5f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/TestAnnotatedType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/TestAnnotatedType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,8 +22,9 @@ import org.jboss.cdi.tck.util.ForwardingAnnotatedType; -/** Makes use of util class ForwardingAnnotatedType<X> - * +/** + * Makes use of util class ForwardingAnnotatedType<X> + * */ public class TestAnnotatedType extends ForwardingAnnotatedType { private AnnotatedType delegate; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Type.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Type.java index cbdd88f499..c135020f2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Type.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/Type.java @@ -16,6 +16,7 @@ public enum Type { - A, B; + A, + B; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/VetoedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/VetoedBean.java index 8cd694cd3b..1f0cdf0c56 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/VetoedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/VetoedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/WildCat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/WildCat.java index b50ca5d660..1d46eb790c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/WildCat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/WildCat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/Dog.java index f5e74b1240..5fade5fa52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java index b3103e79a9..61b4c0cbfb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeEventThrowsExceptionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java index 8355d41b72..ca314e0f82 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processAnnotatedObserverThrowsException/ProcessAnnotatedTypeObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java index 379268037f..10cdca366b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java index c8f459786a..110d4a5725 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/InjectionTargetProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java index cd8526ae3b..2d7c7929de 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/broken/processInjectionTargetThrowsException/ProcessInjectionTargetEventThrowsExceptionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/BeforeBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/BeforeBeanDiscoveryObserver.java index d2f52528b4..67f74b2f15 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/BeforeBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/BeforeBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/ProcessAnnotatedTypeObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/ProcessAnnotatedTypeObserver.java index 59bfdad2a6..b14250f874 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/ProcessAnnotatedTypeObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/ProcessAnnotatedTypeObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,7 +34,8 @@ public void observeDesiredTypes(@WithAnnotations({ Desired.class }) @Observes Pr processedDesiredTypes.add(pat.getAnnotatedType().getJavaClass()); } - public void observeDesiredAndWanted(@WithAnnotations({ Desired.class, Wanted.class }) @Observes ProcessAnnotatedType pat) { + public void observeDesiredAndWanted( + @WithAnnotations({ Desired.class, Wanted.class }) @Observes ProcessAnnotatedType pat) { processedDesiredAndWantedTypes.add(pat.getAnnotatedType().getJavaClass()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/WithAnnotationsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/WithAnnotationsTest.java index a0767a32f9..8c9398e649 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/WithAnnotationsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/WithAnnotationsTest.java @@ -46,7 +46,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(WithAnnotationsTest.class) .withClasses(Baby.class, BeforeBeanDiscoveryObserver.class, Desired.class, Egg.class, Bird.class, Pirate.class, - Falcon.class, BatFalcon.class, AplomadoFalcon.class, Hen.class, Hummingbird.class, BeeHummingbird.class, Chicken.class, + Falcon.class, BatFalcon.class, AplomadoFalcon.class, Hen.class, Hummingbird.class, BeeHummingbird.class, + Chicken.class, RubberChicken.class, Phoenix.class, ProcessAnnotatedTypeObserver.class, Raven.class, Sparrow.class, Jack.class, Turkey.class, OcellatedTurkey.class, Wanted.class, MetaAnnotation.class, Griffin.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) @@ -57,9 +58,12 @@ public static WebArchive createTestArchive() { ProcessAnnotatedTypeObserver processAnnotatedTypeObserver; @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fa"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fb"), - @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fc"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fd"), - @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fe"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ff") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fa"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fb"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fc"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fd"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fe"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ff") }) public void testDelivery() { // Annotated with @Desired or @Wanted @@ -72,7 +76,7 @@ public void testDelivery() { // Annotated with @Desired only assertTypeListMatches(processAnnotatedTypeObserver.getProcessedDesiredTypes(), - // type-level + // type-level Bird.class, Hummingbird.class, BeeHummingbird.class, // member-level Turkey.class, OcellatedTurkey.class, Sparrow.class, Jack.class); @@ -81,7 +85,8 @@ public void testDelivery() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fa"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fc"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fa"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fc"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "g") }) public void testDeliveryMetaAnnotation() { assertTypeListMatches(processAnnotatedTypeObserver.getProcessedMetaAnnotationTypes(), Chicken.class, Hen.class, diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ApplicationObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ApplicationObserver.java index 7789c1ce4f..e49d14ea3a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ApplicationObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ApplicationObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ExtensionObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ExtensionObserver.java index 58cda6cd24..f9afc47bf4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ExtensionObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/ExtensionObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalContainerLifecycleEventParameterTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalContainerLifecycleEventParameterTest.java index 0e4fedabfc..687f549a29 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalContainerLifecycleEventParameterTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalContainerLifecycleEventParameterTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalEventParameterTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalEventParameterTest.java index c09f7c4436..6531df6b80 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalEventParameterTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/delivery/broken/WithAnnotationsAppliedToIllegalEventParameterTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Apple.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Apple.java index 5529dbbd74..9ee4373790 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Apple.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Apple.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/AppleExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/AppleExtension.java index fb2ab47e05..8a368c4743 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/AppleExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/AppleExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fresh.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fresh.java index 1e122a4e64..48cadada88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fresh.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fresh.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fruit.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fruit.java index 1c39862e33..2d15ba26aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fruit.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Fruit.java @@ -14,6 +14,6 @@ package org.jboss.cdi.tck.tests.full.extensions.annotated.synthetic; -public interface Fruit extends Plants{ +public interface Fruit extends Plants { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Juicy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Juicy.java index e770b0ec2d..31316f02a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Juicy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Juicy.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ModifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ModifyingExtension.java index a6f0c41f4e..f3cfd94dbf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ModifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ModifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Orange.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Orange.java index 8947f72468..4d21ff159b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Orange.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Orange.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Pear.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Pear.java index 25c3c4dafa..f584b9c6d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Pear.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Pear.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Plants.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Plants.java index b413d84c9c..130a99ae27 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Plants.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Plants.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ProcessSyntheticAnnotatedTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ProcessSyntheticAnnotatedTypeTest.java index e5a119105b..19cfc83d82 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ProcessSyntheticAnnotatedTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/ProcessSyntheticAnnotatedTypeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -42,7 +42,7 @@ *

      * This test was originally part of Weld test suite. *

      - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -60,12 +60,15 @@ public static WebArchive createTestArchive() { .withTestClassPackage(ProcessSyntheticAnnotatedTypeTest.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withExtensions(RegisteringAnnotationExtension.class, RegisteringExtension1.class, RegisteringExtension2.class, - RegisteringExtension3.class, ModifyingExtension.class, VerifyingExtension.class).build(); + RegisteringExtension3.class, ModifyingExtension.class, VerifyingExtension.class) + .build(); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ae"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "af"), - @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "j"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ag"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ae"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "af"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "j"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ag"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ah") }) public void testEventsFired() { Set> patClasses = verifyingExtension.getPatClasses(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringAnnotationExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringAnnotationExtension.java index b18f2ee820..b405547a27 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringAnnotationExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringAnnotationExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; import jakarta.enterprise.inject.spi.Extension; + import org.jboss.cdi.tck.util.AddForwardingAnnotatedTypeAction; public class RegisteringAnnotationExtension implements Extension { @@ -38,7 +39,7 @@ public AnnotatedType delegate() { }.perform(event); } - + void registerJuicy(@Observes BeforeBeanDiscovery event, final BeanManager manager) { new AddForwardingAnnotatedTypeAction() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension1.java index 75e406ceb7..cbc691d1d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension2.java index 0542e0975f..4be09cf9c0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension3.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension3.java index 6bdfdde81a..5d0b7922f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/RegisteringExtension3.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,9 +22,9 @@ import org.jboss.cdi.tck.util.AddForwardingAnnotatedTypeAction; public class RegisteringExtension3 implements Extension { - - void registerEnum(@Observes BeforeBeanDiscovery event, final BeanManager manager){ - + + void registerEnum(@Observes BeforeBeanDiscovery event, final BeanManager manager) { + new AddForwardingAnnotatedTypeAction() { @Override @@ -37,7 +37,7 @@ public AnnotatedType delegate() { return manager.createAnnotatedType(Vegetables.class); } }.perform(event); - - } + + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/TestAnnotation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/TestAnnotation.java index 278d11aae4..f2567ca124 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/TestAnnotation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/TestAnnotation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Vegetables.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Vegetables.java index eea6cf1e7b..63fc648278 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Vegetables.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/Vegetables.java @@ -6,15 +6,16 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.extensions.annotated.synthetic; +public enum Vegetables implements Plants { -public enum Vegetables implements Plants{ - - CARROT, TOMATO, ONION; + CARROT, + TOMATO, + ONION; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/VerifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/VerifyingExtension.java index 642a657a71..abdc44927a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/VerifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/annotated/synthetic/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,7 +23,6 @@ import jakarta.enterprise.inject.spi.ProcessAnnotatedType; import jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType; - public class VerifyingExtension implements Extension { private Set> patClasses = new HashSet>(); @@ -41,7 +40,7 @@ public void verify(@Observes ProcessAnnotatedType event) { public void verifySource(@Observes ProcessSyntheticAnnotatedType event) { sources.put(event.getAnnotatedType().getJavaClass(), event.getSource()); } - + protected Set> getPatClasses() { return patClasses; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanDiscovery/event/ordering/LifecycleEventOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanDiscovery/event/ordering/LifecycleEventOrderingTest.java index d9959f7df6..2fac8fc1f0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanDiscovery/event/ordering/LifecycleEventOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanDiscovery/event/ordering/LifecycleEventOrderingTest.java @@ -36,8 +36,8 @@ public class LifecycleEventOrderingTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder() - .withTestClassPackage(LifecycleEventOrderingTest.class) - .withExtension(ProductManagement.class).build(); + .withTestClassPackage(LifecycleEventOrderingTest.class) + .withExtension(ProductManagement.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AfterBeanDiscoveryObserver.java index c9bab4edef..30fd1f592e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AnimalStereotype.java index 1b4b10b23f..7a57c84740 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/AnimalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,13 +18,13 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + @Stereotype @Target({ TYPE, METHOD, FIELD }) @Retention(RUNTIME) 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 fd47b31670..1190254c24 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,19 +28,26 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.inject.InjectionException; import jakarta.enterprise.inject.Specializes; -import jakarta.enterprise.inject.Stereotype; import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.InjectionPoint; -import jakarta.enterprise.util.AnnotationLiteral; 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; @@ -55,16 +62,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.io.Serializable; -import java.lang.annotation.Annotation; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.Set; - /** * Mostly tests for extensions specified in chapter 11 of the specification and not already tested elsewhere. * Functionality that is also present in {@link jakarta.enterprise.inject.spi.BeanContainer} should be tested @@ -177,7 +174,8 @@ public void testObtainingInjectionTargetWithDefinitionError() { * META-INF/services, or throws an IllegalArgumentException if the container has no instance of the given class. */ @Test - @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_EXTENSION, id = "a"), @SpecAssertion(section = BM_OBTAIN_EXTENSION, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_EXTENSION, id = "a"), + @SpecAssertion(section = BM_OBTAIN_EXTENSION, id = "b") }) public void testGetExtension() { AfterBeanDiscoveryObserver extension = getCurrentManager().getExtension(AfterBeanDiscoveryObserver.class); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Cow.java index 3d5574560c..06ccf27a5f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/CowBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/CowBean.java index fdc4560c90..1326653fec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/CowBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/CowBean.java @@ -13,13 +13,6 @@ */ package org.jboss.cdi.tck.tests.full.extensions.beanManager; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.Default; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.inject.spi.InjectionPoint; -import jakarta.enterprise.inject.spi.PassivationCapable; - import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -28,6 +21,13 @@ import java.util.HashSet; import java.util.Set; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.spi.PassivationCapable; + public class CowBean implements Bean, PassivationCapable, Serializable { private static final long serialVersionUID = 6249623250272328272L; public static final String PASSIVATION_ID = "Cow-6249623250272328272L"; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DerivedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DerivedBean.java index fbd39eae9f..d52693f7dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DerivedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DerivedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Dog.java index c799d95a05..06698d6aa3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DogHouse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DogHouse.java index c33ffd0e52..2e1494cf88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DogHouse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DogHouse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyContext.java index c790c18a28..99e5df3fb6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyContext.java @@ -14,15 +14,15 @@ package org.jboss.cdi.tck.tests.full.extensions.beanManager; +import java.lang.annotation.Annotation; + import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import java.lang.annotation.Annotation; - /** * @author Martin Kouba - * + * */ public class DummyContext implements Context { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyScoped.java index b48d793e46..bc8828b1ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/DummyScoped.java @@ -18,14 +18,14 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.NormalScope; - import java.lang.annotation.Documented; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; -@Target({TYPE, METHOD, FIELD}) +import jakarta.enterprise.context.NormalScope; + +@Target({ TYPE, METHOD, FIELD }) @Retention(RUNTIME) @Documented @NormalScope diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/InjectionPointDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/InjectionPointDecorator.java index 0ec0c1e56d..67d960952a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/InjectionPointDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/InjectionPointDecorator.java @@ -6,22 +6,22 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.extensions.beanManager; -import jakarta.enterprise.inject.spi.Annotated; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.inject.spi.InjectionPoint; - import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Type; import java.util.Set; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; + public class InjectionPointDecorator implements InjectionPoint { private final InjectionPoint injectionPoint; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/PassivationIdTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/PassivationIdTest.java index 18f64fcd58..afb98d8f84 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/PassivationIdTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/PassivationIdTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.BM_OBTAIN_PASSIVATION_CAPABLE_BEAN; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -36,7 +37,7 @@ @Test(groups = CDI_FULL) @SpecVersion(spec = "cdi", version = "2.0") public class PassivationIdTest extends AbstractTest { - + @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder() @@ -46,7 +47,7 @@ public static WebArchive createTestArchive() { .withExtension(AfterBeanDiscoveryObserver.class) .build(); } - + @Test @SpecAssertion(section = BM_OBTAIN_PASSIVATION_CAPABLE_BEAN, id = "a") public void testGetPassivationCapableBeanById() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/SimpleBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/SimpleBean.java index 88ab2fe5f2..91c4665c58 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/SimpleBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/SimpleBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Tame.java index 3d15721676..4387e04a32 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,12 +19,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.inject.Qualifier; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Terrier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Terrier.java index a639d972e8..7cfe7501fc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Terrier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Terrier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Transactional.java index 83e722ed41..8f3973ee22 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,13 +17,13 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; + @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/UnregisteredExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/UnregisteredExtension.java index 0b84d39a04..97e7d884a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/UnregisteredExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/UnregisteredExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/BeanExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/BeanExtension.java index c49092ee37..12434c620e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/BeanExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/BeanExtension.java @@ -45,7 +45,7 @@ public class BeanExtension implements Extension { @SuppressWarnings("unchecked") void registerBeans(@Observes AfterBeanDiscovery event, BeanManager manager) { - // create a synthetic class bean + // create a synthetic class bean { AnnotatedType oat = manager.createAnnotatedType(Office.class); BeanAttributes oa = manager.createBeanAttributes(oat); @@ -92,7 +92,7 @@ void registerBeans(@Observes AfterBeanDiscovery event, BeanManager manager) { } } assertNotNull(method); - BeanAttributes attributes = (BeanAttributes) starveOut(manager.createBeanAttributes(method)); + BeanAttributes attributes = (BeanAttributes) starveOut(manager.createBeanAttributes(method)); ProducerFactory factory = manager.getProducerFactory(method, zooBean); event.addBean(manager.createBean(attributes, Zoo.class, factory)); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Building.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Building.java index 44c7e1a695..f6a8579146 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Building.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Building.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Employee.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Employee.java index b68e25ef6b..7a0a5e0d07 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Employee.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Employee.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/FireTruck.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/FireTruck.java index ff5dbd5740..98316f6797 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/FireTruck.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/FireTruck.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Hungry.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Hungry.java index 99ef0995dc..d3879a706c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Hungry.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Hungry.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Large.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Large.java index b909f3d398..ce783b20e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Large.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Large.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Lion.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Lion.java index b966de95e9..865ca67d0c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Lion.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Lion.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Office.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Office.java index d155c3e1c3..eb48b6d4bb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Office.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Office.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SerializableOffice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SerializableOffice.java index 55ddecf687..cca9fdd0be 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SerializableOffice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SerializableOffice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Simple.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Simple.java index 18271406b5..76ee76d905 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Simple.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Simple.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SimpleInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SimpleInterceptor.java index dd1d225753..43a04b5b04 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SimpleInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SimpleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SyntheticBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SyntheticBeanTest.java index 8ff942378d..aba0fee44d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SyntheticBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/SyntheticBeanTest.java @@ -26,6 +26,7 @@ import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.PassivationCapable; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -54,7 +55,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(SyntheticBeanTest.class) .withBeansXml( - new BeansXml(BeanDiscoveryMode.ALL).interceptors(SimpleInterceptor.class).decorators(VehicleDecorator.class)) + new BeansXml(BeanDiscoveryMode.ALL).interceptors(SimpleInterceptor.class) + .decorators(VehicleDecorator.class)) .withExtension(BeanExtension.class).build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Tiger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Tiger.java index 669e3afba7..8b3410bd88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Tiger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Tiger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Vehicle.java index c0b84f2cd2..3696e57f61 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Vehicle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,6 +16,6 @@ public interface Vehicle { boolean decorated(); - + String foo(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/VehicleDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/VehicleDecorator.java index 93e16e43f1..32d4f2265f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/VehicleDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/VehicleDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Zoo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Zoo.java index e4faf4289b..af8a0a069d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Zoo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bean/Zoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Animal.java index f6533161c6..bfca820273 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/CreateBeanAttributesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/CreateBeanAttributesTest.java index 06f7b9e434..9fc2d5ac10 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/CreateBeanAttributesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/CreateBeanAttributesTest.java @@ -90,7 +90,6 @@ public void testBeanAttributesForManagedBeanWithModifiedAnnotatedType() { assertFalse(attributes.isAlternative()); } - @SuppressWarnings("unchecked") private void verifyLakeFish(BeanAttributes attributes) { assertTrue(typeSetMatches(attributes.getTypes(), Fish.class, Object.class)); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Fish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Fish.java index 0928b32fc1..1c95937f5f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Fish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Fish.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/InvalidBeanType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/InvalidBeanType.java index 6fb2cccdbe..6aa5248092 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/InvalidBeanType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/InvalidBeanType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Landmark.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Landmark.java index 884617dda3..ff6df1c605 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Landmark.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Landmark.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Mountain.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Mountain.java index 5d44601510..06e988bc0f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Mountain.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Mountain.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Natural.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Natural.java index 0222def856..f1cf4adbf8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Natural.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Natural.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/TundraStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/TundraStereotype.java index b5daf64b85..d08ccc771d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/TundraStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/TundraStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/WaterBody.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/WaterBody.java index 728e9ae6ab..b64f2218f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/WaterBody.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/WaterBody.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Wild.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Wild.java index e68f452809..ae47a3e893 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Wild.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/beanAttributes/Wild.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Foo.java index 16edd6f217..5a3b4ebf90 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/Foo.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.tests.full.extensions.beanManager.bootstrap.unavailable.methods; +import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; import jakarta.inject.Named; -import jakarta.enterprise.event.Observes; @Named("foo") public class Foo { @@ -24,7 +24,7 @@ public class Foo { @Inject BeanManager beanManager; - private void observe(@Observes Integer i){ + private void observe(@Observes Integer i) { } 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 957b486c48..e69b34d861 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 @@ -13,6 +13,10 @@ */ package org.jboss.cdi.tck.tests.full.extensions.beanManager.bootstrap.unavailable.methods; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -21,10 +25,6 @@ import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/UnavailableMethodsDuringApplicationInitializationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/UnavailableMethodsDuringApplicationInitializationTest.java index 21f19cc2d9..d88799f90c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/UnavailableMethodsDuringApplicationInitializationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/bootstrap/unavailable/methods/UnavailableMethodsDuringApplicationInitializationTest.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.full.extensions.beanManager.bootstrap.unavailable.methods; +import static org.jboss.cdi.tck.TestGroups.CDI_FULL; +import static org.jboss.cdi.tck.cdi.Sections.BEANMANAGER; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -23,13 +26,10 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.CDI_FULL; -import static org.jboss.cdi.tck.cdi.Sections.BEANMANAGER; - /** - * + * * This test was originally part of the Weld test suite. - * + * * * @author Martin Kouba * @author Tomas Remes 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 3b61844c82..9d6522cb64 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 @@ -13,12 +13,8 @@ */ package org.jboss.cdi.tck.tests.full.extensions.beanManager.bootstrap.unavailable.methods; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Vetoed; -import jakarta.enterprise.inject.spi.*; -import jakarta.enterprise.util.AnnotationLiteral; +import static org.testng.Assert.fail; + import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Type; @@ -27,7 +23,11 @@ import java.util.HashSet; import java.util.Set; -import static org.testng.Assert.fail; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.spi.*; public class WrongExtension implements Extension { @@ -156,7 +156,8 @@ void execute() { new Invocation() { void execute() { beanManager.getInjectableReference( - beanManager.createInjectionPoint(beanManager.createAnnotatedType(Foo.class).getFields().iterator().next()), + beanManager + .createInjectionPoint(beanManager.createAnnotatedType(Foo.class).getFields().iterator().next()), creationalContext); } }.run(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/broken/event/FireContainerLifecycleEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/broken/event/FireContainerLifecycleEventTest.java index 1b2107143d..5613e4a68a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/broken/event/FireContainerLifecycleEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/broken/event/FireContainerLifecycleEventTest.java @@ -30,10 +30,10 @@ /** * An extension is not allowed to fire an event with runtime type assignable to the type of a container lifecycle event. Tested * extension fires such events during BeforeBeanDiscovery notification. - * + * * @author Martin Kouba * @author Jozef Hartinger - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyMethodExpression.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyMethodExpression.java index f1339ce2d4..e929ca0095 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyMethodExpression.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyMethodExpression.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @SuppressWarnings("serial") public class DummyMethodExpression extends MethodExpression { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyValueExpression.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyValueExpression.java index 36e10f3973..6ee0460433 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyValueExpression.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/DummyValueExpression.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ @SuppressWarnings("serial") public class DummyValueExpression extends ValueExpression { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/Foo.java index 5d6755355b..68e3fb7520 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/Foo.java @@ -23,7 +23,7 @@ /** * @author Martin Kouba - * + * */ @Named public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/WrapExpressionFactoryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/WrapExpressionFactoryTest.java index d21d537c6f..cbabe276b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/WrapExpressionFactoryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/el/WrapExpressionFactoryTest.java @@ -47,7 +47,7 @@ *
    • The resulting instance is reused for every appearance of the EL name
      • *
    • The resulting instance is destroyed when the evaluation completes
      • *
    - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -61,7 +61,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BM_WRAP_EXPRESSIONFACTORY, id = "a"), @SpecAssertion(section = BM_WRAP_EXPRESSIONFACTORY, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = BM_WRAP_EXPRESSIONFACTORY, id = "a"), + @SpecAssertion(section = BM_WRAP_EXPRESSIONFACTORY, id = "b") }) public void testWrapping() { ActionSequence.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java index aea3c23a54..c8bba42819 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/InterceptorBindingEquivalenceTest.java @@ -40,7 +40,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Level.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Level.java index af79bf97f9..5a8b2d3a17 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Level.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Level.java @@ -16,6 +16,7 @@ public enum Level { - A, B; + A, + B; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Missile.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Missile.java index 0d43d768fd..59a3229c16 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Missile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/interceptorbinding/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/Level.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/Level.java index 8e15efa601..a273b8c358 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/Level.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/Level.java @@ -16,6 +16,7 @@ public enum Level { - A, B; + A, + B; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/QualifierEquivalenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/QualifierEquivalenceTest.java index 6ad58d3ef4..9d1744df4a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/QualifierEquivalenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/equivalence/qualifier/QualifierEquivalenceTest.java @@ -101,7 +101,7 @@ public Level level() { private Annotation getContainerProvidedQualifier(Bean bean, Class qualifierClass) { for (Annotation annotation : bean.getQualifiers()) { - if(annotation.annotationType().equals(qualifierClass)) { + if (annotation.annotationType().equals(qualifierClass)) { return annotation; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Book.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Book.java index 6b70fc872f..bd46a2ba82 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Book.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Book.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/CreateInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/CreateInjectionPointTest.java index b8e6406939..9c9d42b146 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/CreateInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/CreateInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -51,7 +51,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Fictional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Fictional.java index e3e18b7a01..5ab2b94997 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Fictional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Fictional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Library.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Library.java index cb5fe2b624..162b9becaf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Library.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Library.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Magazine.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Magazine.java index 922d004e2b..c11c901fae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Magazine.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Magazine.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Monograph.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Monograph.java index a5ff33d192..cae978d95d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Monograph.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/Monograph.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/NotABean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/NotABean.java index 1f32b78dc1..321f965abe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/NotABean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/injectionPoint/NotABean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Elephant.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Elephant.java index 2c02232dd9..9431c22517 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Elephant.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Elephant.java @@ -28,7 +28,7 @@ public class Elephant { public static boolean preDestroyCalled = false; public void use(Proboscis proboscis) { - if(proboscis == null) { + if (proboscis == null) { throw new AssertionError(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Hammer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Hammer.java index 6a2e0ad69d..b90650bc3c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Hammer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/Hammer.java @@ -24,7 +24,7 @@ public class Hammer { public static boolean preDestroyCalled = false; public void use(Nail nail) { - if(nail == null) { + if (nail == null) { throw new AssertionError(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/ToolBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/ToolBinding.java index a9f11bd94f..209ad6cf9f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/ToolBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/ToolBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/broken/House.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/broken/House.java index 72f5e4d485..118b9eadc4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/broken/House.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/beanManager/unmanaged/broken/House.java @@ -18,7 +18,7 @@ @RequestScoped public class House { - public void build(){ + public void build() { } } 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 0e1ad6284a..835afbebcf 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/EventBase.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/EventBase.java index 81712f42dc..1c45a1fd9a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/EventBase.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/EventBase.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public abstract class EventBase { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionAlpha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionAlpha.java index 24d3a70d2e..e434901922 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionAlpha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/ExtensionAlpha.java @@ -24,7 +24,7 @@ /** * @author Martin Kouba - * + * */ public class ExtensionAlpha implements Extension { 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 cbb2ac678d..9d403fc0c7 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 @@ -18,13 +18,12 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.ProcessBean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.cdi.tck.util.ActionSequence; /** * @author Martin Kouba - * + * */ public class ExtensionBeta implements Extension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PatEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PatEvent.java index 6c491b7514..f4dcb7a8b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PatEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PatEvent.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public class PatEvent extends EventBase { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PbEvent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PbEvent.java index be1db6327a..349ba93cde 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PbEvent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/communication/PbEvent.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public class PbEvent extends EventBase { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/DummyConfiguringExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/DummyConfiguringExtension.java index cee88df5df..18623a4fba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/DummyConfiguringExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/DummyConfiguringExtension.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.full.extensions.configurators; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Extension; @@ -51,7 +52,7 @@ void observesFooPBA(@Observes ProcessBeanAttributes event) { sameBAConfiguratorReturned.set(beanAttributesConfigurator.equals(event.configureBeanAttributes())); } - void observesFooPOM(@Observes ProcessObserverMethod event){ + void observesFooPOM(@Observes ProcessObserverMethod event) { ObserverMethodConfigurator observerMethodConfigurator = event.configureObserverMethod(); observerMethodConfigurator.priority(1000); sameOMConfiguratorReturned.set(observerMethodConfigurator.equals(event.configureObserverMethod())); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/Foo.java index c83017c280..410c522209 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/Foo.java @@ -27,7 +27,7 @@ public Bar getBar() { return bar; } - void observes(@Observes Bar bar){ + void observes(@Observes Bar bar) { //no-op } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnimalShelter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnimalShelter.java index 34c1f3ee30..a0815d8e26 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnimalShelter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnimalShelter.java @@ -62,8 +62,8 @@ public boolean isRoomObserved() { return isRoomObserved; } - public void observesRoomInShelter(@Observes @Cats Room room){ - isRoomObserved = true; + public void observesRoomInShelter(@Observes @Cats Room room) { + isRoomObserved = true; } public Cat getCat() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnnotatedTypeConfiguratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnnotatedTypeConfiguratorTest.java index ce96c2b518..df55c4722b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnnotatedTypeConfiguratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/AnnotatedTypeConfiguratorTest.java @@ -30,6 +30,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; + import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; @@ -75,10 +76,14 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bd"), @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bg"), - @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bi"), @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bj"), - @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "b"), @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "b"), - @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "f"), @SpecAssertion(section = ANNOTATED_FIELD_CONFIGURATOR, id = "b"), + @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bd"), + @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bg"), + @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bi"), + @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bj"), + @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "b"), + @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "b"), + @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "f"), + @SpecAssertion(section = ANNOTATED_FIELD_CONFIGURATOR, id = "b"), @SpecAssertion(section = ANNOTATED_PARAMETER_CONFIGURATOR, id = "b") }) public void addMethodsOfAnnotationTypecConfigurator() { @@ -96,7 +101,8 @@ public void addMethodsOfAnnotationTypecConfigurator() { .filter(injectionPoint -> injectionPoint.getQualifiers().contains(new Dogs.DogsLiteral())).collect( Collectors.toList()); assertEquals(dogsInjectionPoints.size(), 2); - Optional feedIpOptional = dogsInjectionPoints.stream().filter(injectionPoint -> injectionPoint.getType().equals(Feed.class)) + Optional feedIpOptional = dogsInjectionPoints.stream() + .filter(injectionPoint -> injectionPoint.getType().equals(Feed.class)) .findFirst(); assertTrue(feedIpOptional.isPresent()); @@ -106,10 +112,14 @@ public void addMethodsOfAnnotationTypecConfigurator() { } @Test - @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "be"), @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bh"), - @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bj"), @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bl"), - @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "c"), @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "c"), - @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "f"), @SpecAssertion(section = ANNOTATED_FIELD_CONFIGURATOR, id = "c"), + @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "be"), + @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bh"), + @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bj"), + @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bl"), + @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "c"), + @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "c"), + @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "f"), + @SpecAssertion(section = ANNOTATED_FIELD_CONFIGURATOR, id = "c"), @SpecAssertion(section = ANNOTATED_PARAMETER_CONFIGURATOR, id = "c") }) public void removeMethodsOfAnnotationTypeConfigurator() { Bean catBean = getUniqueBean(Cat.class); @@ -128,8 +138,10 @@ public void removeMethodsOfAnnotationTypeConfigurator() { } @Test - @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bc"), @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "a"), - @SpecAssertion(section = ANNOTATED_FIELD_CONFIGURATOR, id = "a"), @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "a"), + @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bc"), + @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "a"), + @SpecAssertion(section = ANNOTATED_FIELD_CONFIGURATOR, id = "a"), + @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "a"), @SpecAssertion(section = ANNOTATED_PARAMETER_CONFIGURATOR, id = "a") }) public void annotatedTypesAndMemebersEqual() { assertTrue(ProcessAnnotatedTypeObserver.annotatedTypesEqual.get()); @@ -140,9 +152,12 @@ public void annotatedTypesAndMemebersEqual() { } @Test - @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bf"), @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bk"), - @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "d"), @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "d"), - @SpecAssertion(section = ANNOTATED_PARAMETER_CONFIGURATOR, id = "d"), @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "e"), + @SpecAssertions({ @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bf"), + @SpecAssertion(section = ANNOTATED_TYPE_CONFIGURATOR, id = "bk"), + @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "d"), + @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "d"), + @SpecAssertion(section = ANNOTATED_PARAMETER_CONFIGURATOR, id = "d"), + @SpecAssertion(section = ANNOTATED_METHOD_CONFIGURATOR, id = "e"), @SpecAssertion(section = ANNOTATED_FIELD_CONFIGURATOR, id = "d") }) public void annotationsRemovedFromAnimalShelter() { Bean animalShelterBean = getUniqueBean(AnimalShelter.class); @@ -165,14 +180,15 @@ public void configuratorInitializedWithOriginalAT() { AnnotatedType catAT = getCurrentManager().getExtension(ProcessAnnotatedTypeObserver.class).getOriginalCatAT(); assertTrue(catAT.isAnnotationPresent(RequestScoped.class)); AnnotatedConstructor annotatedConstructor = catAT.getConstructors().stream() - .filter(ac -> ac.getParameters().size() == 1 && ac.getParameters().get(0).getBaseType().equals(Feed.class)).findFirst().get(); + .filter(ac -> ac.getParameters().size() == 1 && ac.getParameters().get(0).getBaseType().equals(Feed.class)) + .findFirst().get(); assertTrue(annotatedConstructor.getParameters().iterator().next().isAnnotationPresent(Cats.class)); assertTrue(annotatedConstructor.isAnnotationPresent(Inject.class)); } @Test @SpecAssertion(section = ANNOTATED_CONSTRUCTOR_CONFIGURATOR, id = "e") - public void configureAndTestConstructorAnnotatedParams(){ + public void configureAndTestConstructorAnnotatedParams() { Assert.assertFalse(countrysideInstance.isUnsatisfied()); Countryside countryside = countrysideInstance.get(); assertEquals(countryside.getWildDog().getName(), "wild dog"); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Cats.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Cats.java index ffea93a11e..93d7639740 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Cats.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Cats.java @@ -27,6 +27,6 @@ public @interface Cats { public static class CatsLiteral extends AnnotationLiteral implements Cats { - public static CatsLiteral INSTANCE = new CatsLiteral(); + public static CatsLiteral INSTANCE = new CatsLiteral(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Countryside.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Countryside.java index 3fc2c4a503..55e2572b02 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Countryside.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Countryside.java @@ -21,7 +21,7 @@ public class Countryside { private final Cat wildCat; @Inject - public Countryside(Dog dog, Cat cat){ + public Countryside(Dog dog, Cat cat) { this.wildCat = cat; this.wildDog = dog; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogDependenciesProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogDependenciesProducer.java index e7ef461a2c..90852a81ee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogDependenciesProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogDependenciesProducer.java @@ -24,12 +24,12 @@ public class DogDependenciesProducer { public static String dogName = "Max"; - public Feed produceFeed(){ - return new Feed(); + public Feed produceFeed() { + return new Feed(); } - public void disposeFeed(Feed feed){ - disposerCalled.set(true); + public void disposeFeed(Feed feed) { + disposerCalled.set(true); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogProducer.java index bc37ad87c9..4464415e6c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/DogProducer.java @@ -23,7 +23,7 @@ public class DogProducer { // This annotation is removed in PAT @Produces - public Dog createDog(){ + public Dog createDog() { return new Dog("charlie"); }; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/ProcessAnnotatedTypeObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/ProcessAnnotatedTypeObserver.java index dd3d907fff..e7e23294e1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/ProcessAnnotatedTypeObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/ProcessAnnotatedTypeObserver.java @@ -48,13 +48,15 @@ public class ProcessAnnotatedTypeObserver implements Extension { void observesDogPAT(@Observes ProcessAnnotatedType event) { - annotatedTypesEqual.set(AnnotatedTypes.compareAnnotatedTypes(event.configureAnnotatedType().getAnnotated(), event.getAnnotatedType())); + annotatedTypesEqual.set( + AnnotatedTypes.compareAnnotatedTypes(event.configureAnnotatedType().getAnnotated(), event.getAnnotatedType())); AnnotatedTypeConfigurator annotatedTypeConfigurator = event.configureAnnotatedType(); // add @RequestScoped to Dog and @Inject and @Dogs to its Feed field annotatedTypeConfigurator.add(RequestScoped.Literal.INSTANCE) .filterFields(af -> (af.getJavaMember() - .getName().equals("feed"))).findFirst().get().add(InjectLiteral.INSTANCE).add(Dogs.DogsLiteral.INSTANCE); + .getName().equals("feed"))) + .findFirst().get().add(InjectLiteral.INSTANCE).add(Dogs.DogsLiteral.INSTANCE); // add @Inject to Dog constructor and @Dogs to its param annotatedTypeConfigurator.constructors().iterator().next().add(InjectLiteral.INSTANCE) @@ -71,12 +73,14 @@ void observesDogDependenciesProducerPAT(@Observes ProcessAnnotatedType af.getJavaMember().getName().equals("dogName")).findFirst().get().add(ProducesLiteral.INSTANCE) + annotatedTypeConfigurator.filterFields(af -> af.getJavaMember().getName().equals("dogName")).findFirst().get() + .add(ProducesLiteral.INSTANCE) .add(Dogs.DogsLiteral.INSTANCE); // add @Disposes to DogDependenciesProducer.disposeFeed getAMConfiguratorByName(annotatedTypeConfigurator, "disposeFeed") - .filterParams(ap -> ap.getPosition() == 0).findFirst().get().add(DisposesLiteral.INSTANCE).add(Dogs.DogsLiteral.INSTANCE); + .filterParams(ap -> ap.getPosition() == 0).findFirst().get().add(DisposesLiteral.INSTANCE) + .add(Dogs.DogsLiteral.INSTANCE); } void observesCatPAT(@Observes ProcessAnnotatedType event) { @@ -94,12 +98,16 @@ void observesCatPAT(@Observes ProcessAnnotatedType event) { .remove(a -> a.equals(InjectLiteral.INSTANCE)); // remove @Inject and @Cats from constructor with parameter - annotatedTypeConfigurator.filterConstructors(ac -> ac.getParameters().size() == 1 && ac.getParameters().get(0).getBaseType().equals(Feed.class)) - .findFirst().get().remove(a -> a.equals(InjectLiteral.INSTANCE)).params().get(0).remove(a -> a.equals(Cats.CatsLiteral.INSTANCE)); + annotatedTypeConfigurator + .filterConstructors( + ac -> ac.getParameters().size() == 1 && ac.getParameters().get(0).getBaseType().equals(Feed.class)) + .findFirst().get().remove(a -> a.equals(InjectLiteral.INSTANCE)).params().get(0) + .remove(a -> a.equals(Cats.CatsLiteral.INSTANCE)); // remove @Observes from Cat.observesCatsFeed method parameter getAMConfiguratorByName(annotatedTypeConfigurator, "observesCatsFeed") - .filterParams(ap -> ap.getPosition() == 0).findFirst().get().remove(a -> a.annotationType().equals(Observes.class)); + .filterParams(ap -> ap.getPosition() == 0).findFirst().get() + .remove(a -> a.annotationType().equals(Observes.class)); } @@ -115,10 +123,12 @@ void observesAnimalShelterPAT(@Observes ProcessAnnotatedType even AnnotatedTypeConfigurator annotatedTypeConfigurator = event.configureAnnotatedType(); //compare AnnotatedMethod from AnnotatedType to the one from AnnotatedMethodConfigurator - AnnotatedMethodConfigurator methodConfigurator = getAMConfiguratorByName(annotatedTypeConfigurator, "observesRoomInShelter"); + AnnotatedMethodConfigurator methodConfigurator = getAMConfiguratorByName( + annotatedTypeConfigurator, "observesRoomInShelter"); AnnotatedMethod annotatedMethod = methodConfigurator.getAnnotated(); annotatedMethodEqual.set(AnnotatedTypes.compareAnnotatedCallable( - event.getAnnotatedType().getMethods().stream().filter(m -> m.getJavaMember().getName().equals("observesRoomInShelter")).findAny().get(), + event.getAnnotatedType().getMethods().stream() + .filter(m -> m.getJavaMember().getName().equals("observesRoomInShelter")).findAny().get(), annotatedMethod)); // compare AnnotatedConstructor from AnnotatedType to the one from AnnotatedConstructorConfigurator @@ -130,19 +140,24 @@ void observesAnimalShelterPAT(@Observes ProcessAnnotatedType even AnnotatedConstructor originalAnnotatedConstructor = event.getAnnotatedType().getConstructors().stream() .filter(m -> m.isAnnotationPresent(Inject.class)).findAny().get(); - annotatedConstructorEqual.set(AnnotatedTypes.compareAnnotatedCallable(originalAnnotatedConstructor, configuratorAnnotatedConstructor)); + annotatedConstructorEqual + .set(AnnotatedTypes.compareAnnotatedCallable(originalAnnotatedConstructor, configuratorAnnotatedConstructor)); // compare AnnotatedParameter from AnnotatedType to the one from AnnotatedParameterConfigurator annotatedParameterEqual - .set(AnnotatedTypes.compareAnnotatedParameters(originalAnnotatedConstructor.getParameters(), configuratorAnnotatedConstructor.getParameters())); + .set(AnnotatedTypes.compareAnnotatedParameters(originalAnnotatedConstructor.getParameters(), + configuratorAnnotatedConstructor.getParameters())); //compare AnnnotatedField from AnnotatedType to the one from AnnotatedFieldConfigurator - AnnotatedFieldConfigurator fieldConfigurator = annotatedTypeConfigurator.filterFields(annotatedField -> { - return annotatedField.getJavaMember().getName().equals("cat"); - }).findFirst().get(); + AnnotatedFieldConfigurator fieldConfigurator = annotatedTypeConfigurator + .filterFields(annotatedField -> { + return annotatedField.getJavaMember().getName().equals("cat"); + }).findFirst().get(); AnnotatedField annotatedField = fieldConfigurator.getAnnotated(); annotatedFieldEqual.set(AnnotatedTypes - .compareAnnotatedField(event.getAnnotatedType().getFields().stream().filter(af -> af.getJavaMember().getName().equals("cat")).findAny().get(), + .compareAnnotatedField( + event.getAnnotatedType().getFields().stream().filter(af -> af.getJavaMember().getName().equals("cat")) + .findAny().get(), annotatedField)); // remove all annotations @@ -164,7 +179,8 @@ void observesCountrysidePAT(@Observes ProcessAnnotatedType event) { annotatedConstructorConfigurator.params().forEach(annotatedParam -> annotatedParam.add(Wild.WildLiteral.INSTANCE)); } - private AnnotatedMethodConfigurator getAMConfiguratorByName(AnnotatedTypeConfigurator annotatedTypeConfigurator, String name) { + private AnnotatedMethodConfigurator getAMConfiguratorByName( + AnnotatedTypeConfigurator annotatedTypeConfigurator, String name) { return annotatedTypeConfigurator.filterMethods(am -> am.getJavaMember().getName().equals(name)).findFirst().get(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Wild.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Wild.java index fd885f0929..80b8902e06 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Wild.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/Wild.java @@ -17,6 +17,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/AnnotatedTypeConfiguratorInBBDTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/AnnotatedTypeConfiguratorInBBDTest.java index 4ab3bb83e2..8a8876b32b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/AnnotatedTypeConfiguratorInBBDTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/AnnotatedTypeConfiguratorInBBDTest.java @@ -46,11 +46,11 @@ public static WebArchive createTestArchive() { .withExtensions(BBDObservingExtension.class) .build(); } - + @Inject @Any Instance instance; - + @Test @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "c") public void testQualifierAddition() { @@ -58,7 +58,7 @@ public void testQualifierAddition() { Assert.assertFalse(fooInstance.isUnsatisfied()); Assert.assertNotNull(fooInstance.get()); } - + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "d") public void testInterceptorBindingAddition(@Any Foo foo) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/BBDObservingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/BBDObservingExtension.java index 8bd9e6d63f..68410e27f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/BBDObservingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/BBDObservingExtension.java @@ -22,11 +22,11 @@ * @author Matej Novotny */ public class BBDObservingExtension implements Extension { - + public void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event) { // turn annotation into qualifier event.configureQualifier(CustomQualifier.class); - + // turn annotation into binding event.configureInterceptorBinding(CustomBinding.class); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomBinding.java index 56b083872d..0a0dd72453 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomBinding.java @@ -21,7 +21,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -/** {@link jakarta.interceptor.InterceptorBinding} annotation is deliberately missing, will be registered as one in extension +/** + * {@link jakarta.interceptor.InterceptorBinding} annotation is deliberately missing, will be registered as one in extension * * @author Matej Novotny */ @@ -29,5 +30,5 @@ @Retention(RUNTIME) @Documented public @interface CustomBinding { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomQualifier.java index 2b2c9e2a6e..19471d5745 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/CustomQualifier.java @@ -20,7 +20,8 @@ import jakarta.enterprise.util.AnnotationLiteral; -/** {@link jakarta.inject.Qualifier} annotation is deliberately missing, will be registered as one in extension +/** + * {@link jakarta.inject.Qualifier} annotation is deliberately missing, will be registered as one in extension * * @author Matej Novotny */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/Foo.java index 958a95dc9e..2e7c527305 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/Foo.java @@ -23,8 +23,8 @@ @CustomBinding @CustomQualifier public class Foo { - - public void shouldTriggerInterceptor () { + + public void shouldTriggerInterceptor() { // no-op, calling it should trigger interceptor } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/FooInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/FooInterceptor.java index 7ca60adc26..243d73ada1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/FooInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/annotatedTypeConfigurator/beforeBeanDiscovery/FooInterceptor.java @@ -26,9 +26,9 @@ @Priority(2000) @CustomBinding public class FooInterceptor { - + public static boolean interceptorInvoked = false; - + @AroundInvoke public Object intercept(InvocationContext ctx) throws Exception { interceptorInvoked = true; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/BeanConfiguratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/BeanConfiguratorTest.java index 0582372ae8..8724e7f328 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/BeanConfiguratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/BeanConfiguratorTest.java @@ -71,7 +71,8 @@ public void testCreationalAndDisposalMethods() { CreationalContext skeletonCreationalContext = getCurrentManager().createCreationalContext(skeletonBean); Skeleton skeleton = skeletonBean.create(skeletonCreationalContext); - Bean zombieBean = getUniqueBean(Zombie.class, Undead.UndeadLiteral.INSTANCE, Dangerous.DangerousLiteral.INSTANCE); + Bean zombieBean = getUniqueBean(Zombie.class, Undead.UndeadLiteral.INSTANCE, + Dangerous.DangerousLiteral.INSTANCE); CreationalContext zombieCreationalContext = getCurrentManager().createCreationalContext(zombieBean); Zombie zombie = zombieBean.create(zombieCreationalContext); @@ -99,7 +100,7 @@ public void testCreationalAndDisposalMethods() { @SpecAssertion(section = BEAN_CONFIGURATOR, id = "b"), @SpecAssertion(section = BEAN_CONFIGURATOR, id = "c"), @SpecAssertion(section = BEAN_CONFIGURATOR, id = "d"), - @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "de")}) + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "de") }) public void testInjectionPoints() { // Dungeon should have Skeleton, Zombie, Ghost and Vampire Injected assertTrue(dungeon.hasAllMonters()); @@ -107,7 +108,8 @@ public void testInjectionPoints() { // skeleton has one IP only assertTrue(getUniqueBean(Skeleton.class, Undead.UndeadLiteral.INSTANCE).getInjectionPoints().size() == 1); // zombie has two different - assertTrue(getUniqueBean(Zombie.class, Undead.UndeadLiteral.INSTANCE, Dangerous.DangerousLiteral.INSTANCE).getInjectionPoints().size() == 2); + assertTrue(getUniqueBean(Zombie.class, Undead.UndeadLiteral.INSTANCE, Dangerous.DangerousLiteral.INSTANCE) + .getInjectionPoints().size() == 2); // ghost has two but one was replaces with the other, resulting in only one IP Set ghostIP = getUniqueBean(Ghost.class, Undead.UndeadLiteral.INSTANCE).getInjectionPoints(); assertTrue(ghostIP.size() == 1); @@ -125,7 +127,7 @@ public void testPassivationCapability() { @Test @SpecAssertion(section = BEAN_CONFIGURATOR, id = "h") - public void testDefaultScopeOfAddedBean(){ + public void testDefaultScopeOfAddedBean() { Bean bogeyBean = getUniqueBean(Bogey.class, Undead.UndeadLiteral.INSTANCE); assertEquals(bogeyBean.getScope(), Dependent.class); Bean werewolfBean = getUniqueBean(Werewolf.class); @@ -133,7 +135,8 @@ public void testDefaultScopeOfAddedBean(){ } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "da"), @SpecAssertion(section = PROCESS_BEAN, id = "eca") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "da"), + @SpecAssertion(section = PROCESS_BEAN, id = "eca") }) public void processSynthethicBeanEventFired(LifecycleObserver extension) { assertTrue(extension.isSkeletonPSBFired()); assertTrue(extension.isVampirePSBFired()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dangerous.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dangerous.java index 32048a62cb..0b1cea8254 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dangerous.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dangerous.java @@ -27,12 +27,12 @@ */ @Qualifier @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE }) public @interface Dangerous { - + public static class DangerousLiteral extends AnnotationLiteral implements Dangerous { - + public static DangerousLiteral INSTANCE = new DangerousLiteral(); } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/DesireToHurtHumans.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/DesireToHurtHumans.java index d457900f84..33f69fd2c9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/DesireToHurtHumans.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/DesireToHurtHumans.java @@ -13,10 +13,11 @@ */ package org.jboss.cdi.tck.tests.full.extensions.configurators.bean; -/** Dummy bean used to add as injection point into newly created beans +/** + * Dummy bean used to add as injection point into newly created beans * * @author Matej Novotny */ public class DesireToHurtHumans { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dungeon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dungeon.java index 4c124cd5aa..0d9734a8b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dungeon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Dungeon.java @@ -16,46 +16,47 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -/** Simple class checking that all 'manually' created beans can be injected +/** + * Simple class checking that all 'manually' created beans can be injected * * @author Matej Novotny */ @ApplicationScoped public class Dungeon { - + @Inject @Undead private Skeleton skeleton; - + @Inject @Undead @Dangerous private Zombie zombie; - + @Inject @Undead private Ghost ghost; - + @Inject @Undead private Vampire vampire; - + public boolean hasAllMonters() { return skeleton != null && zombie != null && ghost != null && vampire != null; } - + public Skeleton getSkeleton() { return skeleton; } - + public Zombie getZombie() { return zombie; } - + public Ghost getGhost() { return ghost; } - + public Vampire getVampire() { return vampire; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Ghost.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Ghost.java index 978e19fdf6..2041bd8654 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Ghost.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Ghost.java @@ -16,26 +16,27 @@ import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; -/** {@link Vetoed} makes sure this bean does not get picked up by CDI +/** + * {@link Vetoed} makes sure this bean does not get picked up by CDI * * @author Matej Novotny */ @Vetoed public class Ghost { - + private boolean invisible; - + @Inject private Weapon weapon; - + @Inject private DesireToHurtHumans evilDesire; - + public Ghost(boolean invisible) { this.invisible = invisible; } - + public Ghost() { - + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/LifecycleObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/LifecycleObserver.java index 0ee095bf50..51b8bf1536 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/LifecycleObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/LifecycleObserver.java @@ -17,6 +17,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.event.Observes; @@ -63,7 +64,7 @@ public void observeUndead(@Observes AfterBeanDiscovery abd, BeanManager bm) { } private void configureSkeleton(BeanManager bm, BeanConfigurator skeleton) { - // set bean class, qualifier, stereotype, scope + // set bean class, qualifier, stereotype, scope // no read() method used here, all set manually skeleton.beanClass(Skeleton.class); skeleton.addQualifier(Undead.UndeadLiteral.INSTANCE); @@ -159,14 +160,14 @@ private void configureVampire(BeanManager bm, BeanConfigurator vampire) }); } - private void configureBogey(BeanManager bm, BeanConfigurator bogey){ + private void configureBogey(BeanManager bm, BeanConfigurator bogey) { bogey.beanClass(Bogey.class); bogey.addType(Bogey.class); bogey.addQualifier(Undead.UndeadLiteral.INSTANCE); bogey.produceWith(obj -> new Bogey()); } - private void configureWerewolf(BeanManager bm, BeanConfigurator werewolf){ + private void configureWerewolf(BeanManager bm, BeanConfigurator werewolf) { werewolf.beanClass(Werewolf.class); werewolf.addTransitiveTypeClosure(Werewolf.class); Set> stereotypes = new HashSet<>(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Monster.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Monster.java index e4fe48cc79..bc1b22ee12 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Monster.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Monster.java @@ -26,7 +26,7 @@ */ @Stereotype @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE }) public @interface Monster { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/MonsterController.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/MonsterController.java index e71298688d..3e043ac380 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/MonsterController.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/MonsterController.java @@ -44,7 +44,7 @@ public class MonsterController { zombieProducerCalled = true; return new Zombie(t.select(Boolean.class).get()); }; - + public static BiConsumer> zombieConsumer = new BiConsumer>() { @Override diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Skeleton.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Skeleton.java index 54275ee84b..df9011cbfe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Skeleton.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Skeleton.java @@ -16,24 +16,24 @@ import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; -/** {@link Vetoed} ensures this bean will not get picked up by CDI automatically +/** + * {@link Vetoed} ensures this bean will not get picked up by CDI automatically * * @author Matej Novotny */ @Vetoed public class Skeleton { - + private int healthPoints; - + @Inject private DesireToHurtHumans evilDesire; - - public Skeleton (int healthPoints) { + public Skeleton(int healthPoints) { this.healthPoints = healthPoints; } - + public Skeleton() { - + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Undead.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Undead.java index c78f437f43..04e931ed6f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Undead.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Undead.java @@ -27,12 +27,12 @@ */ @Qualifier @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) +@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE }) public @interface Undead { - + public static class UndeadLiteral extends AnnotationLiteral implements Undead { - + public static UndeadLiteral INSTANCE = new UndeadLiteral(); } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Vampire.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Vampire.java index 41b05f4eaf..a8cb1d9c21 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Vampire.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Vampire.java @@ -15,20 +15,21 @@ import jakarta.enterprise.inject.Vetoed; -/** {@link Vetoed} makes sure this bean does not get picked up by CDI +/** + * {@link Vetoed} makes sure this bean does not get picked up by CDI * * @author Matej Novotny */ @Vetoed public class Vampire { - + private boolean hungry; - + public Vampire(boolean hungry) { this.hungry = hungry; } - + public Vampire() { - + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Weapon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Weapon.java index de6fdfc0f3..2cbca18615 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Weapon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Weapon.java @@ -13,10 +13,11 @@ */ package org.jboss.cdi.tck.tests.full.extensions.configurators.bean; -/** Dummy class used for injection into beans +/** + * Dummy class used for injection into beans * * @author Matej Novotny */ public class Weapon { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Zombie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Zombie.java index e4f5770b82..0efdb62ea6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Zombie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/Zombie.java @@ -15,23 +15,24 @@ import jakarta.enterprise.inject.Vetoed; -/** {@link Vetoed} makes sure this bean does not get picked up by CDI +/** + * {@link Vetoed} makes sure this bean does not get picked up by CDI * * @author Matej Novotny */ @Vetoed public class Zombie { - + private boolean decaying; - + private Weapon weapon; private DesireToHurtHumans evilDesire; - + public Zombie(boolean decaying) { this.decaying = decaying; } - + public Zombie() { - + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/AlternativePriorityExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/AlternativePriorityExtension.java index dc790a0e03..c8f571e48d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/AlternativePriorityExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/AlternativePriorityExtension.java @@ -13,38 +13,13 @@ */ package org.jboss.cdi.tck.tests.full.extensions.configurators.bean.alternativePriority; +import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Model; import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.AnnotatedField; -import jakarta.enterprise.inject.spi.AnnotatedType; -import jakarta.enterprise.inject.spi.BeanAttributes; -import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.Extension; -import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.ProcessSyntheticBean; -import jakarta.enterprise.inject.spi.configurator.BeanConfigurator; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Bogey; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Dangerous; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.DesireToHurtHumans; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Ghost; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Monster; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.MonsterController; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Skeleton; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Undead; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Vampire; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Weapon; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Werewolf; -import org.jboss.cdi.tck.tests.full.extensions.configurators.bean.Zombie; - -import java.lang.annotation.Annotation; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; public class AlternativePriorityExtension implements Extension { private AtomicBoolean syntheticAlternativeProcessed = new AtomicBoolean(false); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/BeanConfiguratorAlternativePriorityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/BeanConfiguratorAlternativePriorityTest.java index 368bbba15e..8e07c88601 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/BeanConfiguratorAlternativePriorityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/bean/alternativePriority/BeanConfiguratorAlternativePriorityTest.java @@ -13,7 +13,13 @@ */ package org.jboss.cdi.tck.tests.full.extensions.configurators.bean.alternativePriority; +import static org.jboss.cdi.tck.TestGroups.CDI_FULL; +import static org.jboss.cdi.tck.cdi.Sections.BEAN_CONFIGURATOR; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -22,11 +28,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.CDI_FULL; -import static org.jboss.cdi.tck.cdi.Sections.BEAN_CONFIGURATOR; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "cdi", version = "4.0") public class BeanConfiguratorAlternativePriorityTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Axe.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Axe.java index b4ca66e89f..c08ce4e4b8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Axe.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Axe.java @@ -21,5 +21,5 @@ */ @ApplicationScoped public class Axe { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java index 85f8f24ee0..9ae36ee051 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/BeanAttributesConfiguratorTest.java @@ -19,10 +19,17 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanAttributes; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -34,12 +41,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - /** * @author Matej Novotny */ @@ -89,7 +90,8 @@ public void testMultiAdditionMethods() { Set types = bean.getTypes(); assertTrue(bean.getScope().equals(RequestScoped.class)); - assertTrue(qualifiers.containsAll(new HashSet<>(Arrays.asList(Reforged.ReforgedLiteral.INSTANCE, TwoHanded.TwoHandedLiteral.INSTANCE)))); + assertTrue(qualifiers.containsAll( + new HashSet<>(Arrays.asList(Reforged.ReforgedLiteral.INSTANCE, TwoHanded.TwoHandedLiteral.INSTANCE)))); assertTrue(stereotypes.containsAll(new HashSet<>(Arrays.asList(Melee.class, Equipment.class)))); assertTrue(types.containsAll(new HashSet<>(Arrays.asList(Weapon.class, Tool.class)))); assertTrue(bean.isAlternative()); @@ -108,7 +110,8 @@ public void testReplacementMethods() { Set> stereotypes = bean.getStereotypes(); // list will contain the replaced Qualifier + Any - assertTrue(bean.getQualifiers().equals(new HashSet<>(Arrays.asList(Reforged.ReforgedLiteral.INSTANCE, Any.Literal.INSTANCE)))); + assertTrue(bean.getQualifiers() + .equals(new HashSet<>(Arrays.asList(Reforged.ReforgedLiteral.INSTANCE, Any.Literal.INSTANCE)))); assertTrue(types.containsAll(new HashSet<>(Arrays.asList(Tool.class, UsableItem.class)))); assertTrue(stereotypes.equals(new HashSet<>(Arrays.asList(Equipment.class)))); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Hoe.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Hoe.java index 264e54b353..4d2361247d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Hoe.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Hoe.java @@ -20,5 +20,5 @@ @Melee @TwoHanded public class Hoe { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Melee.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Melee.java index 065df851f9..29513db3a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Melee.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Melee.java @@ -28,5 +28,5 @@ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface Melee { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/ProcessBeanAttributesObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/ProcessBeanAttributesObserver.java index e4f9c37e3f..1e1b3712be 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/ProcessBeanAttributesObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/ProcessBeanAttributesObserver.java @@ -17,6 +17,7 @@ import java.lang.reflect.Type; import java.util.HashSet; import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.AnnotatedType; @@ -40,7 +41,7 @@ public void observeSword(@Observes ProcessBeanAttributes pba) { // add qualifier @TwoHanded // add Type Weapon.class // set name - // set stereotype + // set stereotype configurator.addQualifier(TwoHanded.TwoHandedLiteral.INSTANCE); configurator.addType(Weapon.class); configurator.name(BeanAttributesConfiguratorTest.SWORD_NAME); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Reforged.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Reforged.java index cf5674809b..2c0d294e06 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Reforged.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Reforged.java @@ -29,9 +29,9 @@ @Retention(RetentionPolicy.RUNTIME) @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE }) public @interface Reforged { - + public static class ReforgedLiteral extends AnnotationLiteral implements Reforged { - + public static ReforgedLiteral INSTANCE = new ReforgedLiteral(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Sword.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Sword.java index 759b1ec1d2..9d7cc56205 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Sword.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Sword.java @@ -15,12 +15,11 @@ import jakarta.enterprise.context.ApplicationScoped; - /** * * @author Matej Novotny */ @ApplicationScoped public class Sword { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Tool.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Tool.java index 0f1b25cb9f..e572872c9e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Tool.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Tool.java @@ -18,5 +18,5 @@ * @author Matej Novotny */ public interface Tool extends UsableItem { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/UsableItem.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/UsableItem.java index 963188c679..e3ffb9a8af 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/UsableItem.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/UsableItem.java @@ -18,5 +18,5 @@ * @author Matej Novotny */ public interface UsableItem { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Weapon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Weapon.java index deb5e1acce..2d8e66be97 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Weapon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/beanAttributes/Weapon.java @@ -18,5 +18,5 @@ * @author Matej Novotny */ public interface Weapon extends Tool { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/AirPlane.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/AirPlane.java index 63cab11459..c76aeac475 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/AirPlane.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/AirPlane.java @@ -18,6 +18,6 @@ public class AirPlane { @Inject - public AirPlane(Tank tank){ + public AirPlane(Tank tank) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Engine.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Engine.java index 5aed3cf535..1bd0625e8f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Engine.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Engine.java @@ -13,6 +13,5 @@ */ package org.jboss.cdi.tck.tests.full.extensions.configurators.injectionPoint; - public class Engine { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Helicopter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Helicopter.java index 68a7386196..80fecb185b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Helicopter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/Helicopter.java @@ -20,7 +20,7 @@ public class Helicopter { @Inject Engine engine; - public Engine getEngine(){ + public Engine getEngine() { return engine; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/InjectionPointConfiguratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/InjectionPointConfiguratorTest.java index 8521e0d2c0..afda88c805 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/InjectionPointConfiguratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionPoint/InjectionPointConfiguratorTest.java @@ -22,6 +22,7 @@ import java.lang.reflect.Type; import java.util.Collections; import java.util.List; + import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.inject.spi.InjectionPoint; @@ -68,7 +69,8 @@ public void changeTypeAndAddQualifier() { @SpecAssertion(section = INJECTION_POINT_CONFIGURATOR, id = "be") }) public void replaceQualifiersAndDelegate() { - List> vehicleDecorators = getCurrentManager().resolveDecorators(Collections.singleton(Car.class), Driving.DrivingLiteral.INSTANCE); + List> vehicleDecorators = getCurrentManager().resolveDecorators(Collections. singleton(Car.class), + Driving.DrivingLiteral.INSTANCE); assertEquals(vehicleDecorators.size(), 1); Decorator vehicleDecorator = (Decorator) vehicleDecorators.get(0); assertEquals(vehicleDecorator.getInjectionPoints().size(), 1); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/InjectionTargetFactoryConfigureTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/InjectionTargetFactoryConfigureTest.java index e0e0f5dbcc..599ee84de9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/InjectionTargetFactoryConfigureTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/InjectionTargetFactoryConfigureTest.java @@ -51,9 +51,9 @@ public static WebArchive createTestArchive() { IoCForFramework ioc; @Test - @SpecAssertions({ - @SpecAssertion(section = BM_OBTAIN_INJECTIONTARGET, id = "b"), - @SpecAssertion(section = BM_OBTAIN_INJECTIONTARGET, id = "c") }) + @SpecAssertions({ + @SpecAssertion(section = BM_OBTAIN_INJECTIONTARGET, id = "b"), + @SpecAssertion(section = BM_OBTAIN_INJECTIONTARGET, id = "c") }) public void testInjectionTargetFactoryConfigure() { // now if everything went as expected, NotOurClass will have SomeService injected Assert.assertNotNull(noc.getService()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/IoCForFramework.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/IoCForFramework.java index c66b11ac0a..869a7d9239 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/IoCForFramework.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/injectionTargetFactory/IoCForFramework.java @@ -33,19 +33,22 @@ public class IoCForFramework { private InjectionTarget it; private boolean exceptionThrown = false; - public IoCForFramework(){} + public IoCForFramework() { + } @Inject public IoCForFramework(BeanManager bm) { nocc = bm.createCreationalContext(null); InjectionTargetFactory itf = bm.getInjectionTargetFactory(bm.createAnnotatedType(NotOurClass.class)); - itf.configure().filterMethods(m -> m.getJavaMember().getName().equals("setService")).findFirst().get().add(InjectLiteral.INSTANCE); + itf.configure().filterMethods(m -> m.getJavaMember().getName().equals("setService")).findFirst().get() + .add(InjectLiteral.INSTANCE); it = itf.createInjectionTarget(null); // invoking configure() after create method should throw exception try { - itf.configure().filterMethods(m -> m.getJavaMember().getName().equals("setService")).findFirst().get().add(InjectLiteral.INSTANCE); + itf.configure().filterMethods(m -> m.getJavaMember().getName().equals("setService")).findFirst().get() + .add(InjectLiteral.INSTANCE); } catch (IllegalStateException e) { //expected behaviour exceptionThrown = true; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/ConfigureAndSetExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/ConfigureAndSetExtension.java index 7db075e846..b3b4012806 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/ConfigureAndSetExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/ConfigureAndSetExtension.java @@ -81,7 +81,8 @@ public Set getTypes() { } public Set getQualifiers() { - return Collections.unmodifiableSet(new HashSet(Arrays.asList(Any.Literal.INSTANCE, Default.Literal.INSTANCE))); + return Collections.unmodifiableSet( + new HashSet(Arrays.asList(Any.Literal.INSTANCE, Default.Literal.INSTANCE))); } public Class getScope() { @@ -93,7 +94,7 @@ public String getName() { } public Set> getStereotypes() { - return Collections.>emptySet(); + return Collections.> emptySet(); } public boolean isAlternative() { @@ -115,7 +116,8 @@ public Set getTypes() { } public Set getQualifiers() { - return Collections.unmodifiableSet(new HashSet(Arrays.asList(Any.Literal.INSTANCE, Default.Literal.INSTANCE))); + return Collections.unmodifiableSet( + new HashSet(Arrays.asList(Any.Literal.INSTANCE, Default.Literal.INSTANCE))); } public Class getScope() { @@ -127,7 +129,7 @@ public String getName() { } public Set> getStereotypes() { - return Collections.>emptySet(); + return Collections.> emptySet(); } public boolean isAlternative() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/TestAnnotatedType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/TestAnnotatedType.java index d3f89b4c6c..51204701c3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/TestAnnotatedType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/invalid/TestAnnotatedType.java @@ -17,7 +17,8 @@ import org.jboss.cdi.tck.util.ForwardingAnnotatedType; -/** Makes use of util class ForwardingAnnotatedType<X> +/** + * Makes use of util class ForwardingAnnotatedType<X> * * @author Matej Novotny */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/AfterBeanDiscoveryObserver.java index d759693d8b..1e54d2061b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/AfterBeanDiscoveryObserver.java @@ -56,7 +56,7 @@ void processObserverMethod(@Observes ProcessObserverMethod void observesABD(@Observes AfterBeanDiscovery abd) throws NoSuchMethodException { // read from ObserverMethod - abd.addObserverMethod().read(fruitObserverMethod).beanClass(FruitObserver.class).observedType(Banana.class) + abd. addObserverMethod().read(fruitObserverMethod).beanClass(FruitObserver.class).observedType(Banana.class) .addQualifiers(Ripe.RipeLiteral.INSTANCE, Any.Literal.INSTANCE) .notifyWith((b) -> { newBananaObserverNotified.set(true); @@ -106,7 +106,8 @@ public void notify(Cherry cherry) { } }); - abd.addObserverMethod().observedType(Papaya.class).reception(Reception.ALWAYS).notifyWith(eventContext -> newPapayaObserverNotified.set(true)); + abd.addObserverMethod().observedType(Papaya.class).reception(Reception.ALWAYS) + .notifyWith(eventContext -> newPapayaObserverNotified.set(true)); } public static void reset() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/FruitObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/FruitObserver.java index a12c7bfc02..56164b761b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/FruitObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/FruitObserver.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.full.extensions.configurators.observerMethod; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; @@ -25,7 +26,6 @@ public class FruitObserver { public static AtomicBoolean bananaObserverNotified = new AtomicBoolean(false); public static AtomicBoolean pearObserverNotified = new AtomicBoolean(false); - public void observesPear(@Observes Pear pear) { pearObserverNotified.set(true); } @@ -48,7 +48,7 @@ public void observesPeach(@Observes Peach peach) { peachObserverNotified.set(true); } - public void observesKiwi(@Observes @Ripe Kiwi kiwi){ + public void observesKiwi(@Observes @Ripe Kiwi kiwi) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ObserverMethodConfiguratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ObserverMethodConfiguratorTest.java index 50855cf496..dba1e862a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ObserverMethodConfiguratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ObserverMethodConfiguratorTest.java @@ -71,7 +71,8 @@ public static WebArchive createTestArchive() { .withClass(ObservesLiteral.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withExtensions(ProcessObserverMethodObserver.class, AfterBeanDiscoveryObserver.class, - ProcessSyntheticObserverMethodObserver.class).build(); + ProcessSyntheticObserverMethodObserver.class) + .build(); } @Test @@ -81,7 +82,8 @@ public static WebArchive createTestArchive() { @SpecAssertion(section = OBSERVER_METHOD_CONFIGURATOR, id = "bi") }) public void addQualifiersAndSetPriorityAndChangeToAsync() throws InterruptedException { Set> pearEventObservers = getCurrentManager() - .resolveObserverMethods(new Pear(), Any.Literal.INSTANCE, Ripe.RipeLiteral.INSTANCE, Delicious.DeliciousLiteral.INSTANCE); + .resolveObserverMethods(new Pear(), Any.Literal.INSTANCE, Ripe.RipeLiteral.INSTANCE, + Delicious.DeliciousLiteral.INSTANCE); assertEquals(pearEventObservers.size(), 1); assertEquals(pearEventObservers.iterator().next().getPriority(), ObserverMethod.DEFAULT_PRIORITY + 100); assertEquals(pearEventObservers.iterator().next().isAsync(), true); @@ -90,7 +92,8 @@ public void addQualifiersAndSetPriorityAndChangeToAsync() throws InterruptedExce Collectors.toSet())); BlockingQueue queue = new LinkedBlockingQueue<>(); - pearEvent.select(Any.Literal.INSTANCE, Ripe.RipeLiteral.INSTANCE, Delicious.DeliciousLiteral.INSTANCE).fireAsync(new Pear()).thenAccept(queue::offer); + pearEvent.select(Any.Literal.INSTANCE, Ripe.RipeLiteral.INSTANCE, Delicious.DeliciousLiteral.INSTANCE) + .fireAsync(new Pear()).thenAccept(queue::offer); Pear pear = queue.poll(2, TimeUnit.SECONDS); assertNotNull(pear); assertTrue(FruitObserver.pearObserverNotified.get()); @@ -106,7 +109,8 @@ public void setReceptionAndTransactionPhase() { assertEquals(orangeEventObservers.size(), 1); assertEquals(orangeEventObservers.iterator().next().getReception(), Reception.IF_EXISTS); assertEquals(orangeEventObservers.iterator().next().getTransactionPhase(), TransactionPhase.AFTER_SUCCESS); - assertEquals(orangeEventObservers.iterator().next().getObservedQualifiers(), Collections.singleton(Delicious.DeliciousLiteral.INSTANCE)); + assertEquals(orangeEventObservers.iterator().next().getObservedQualifiers(), + Collections.singleton(Delicious.DeliciousLiteral.INSTANCE)); } @Test @@ -114,9 +118,11 @@ public void setReceptionAndTransactionPhase() { @SpecAssertion(section = OBSERVER_METHOD_CONFIGURATOR, id = "bc"), @SpecAssertion(section = OBSERVER_METHOD_CONFIGURATOR, id = "bh") }) public void notifyAcceptingConsumerNotified() { - getCurrentManager().getEvent().select(Pineapple.class, Any.Literal.INSTANCE, Delicious.DeliciousLiteral.INSTANCE).fire(new Pineapple()); + getCurrentManager().getEvent().select(Pineapple.class, Any.Literal.INSTANCE, Delicious.DeliciousLiteral.INSTANCE) + .fire(new Pineapple()); assertTrue(ProcessObserverMethodObserver.consumerNotified.get()); - assertEquals(ProcessObserverMethodObserver.pineAppleQualifiers, Arrays.asList(Any.Literal.INSTANCE, Delicious.DeliciousLiteral.INSTANCE)); + assertEquals(ProcessObserverMethodObserver.pineAppleQualifiers, + Arrays.asList(Any.Literal.INSTANCE, Delicious.DeliciousLiteral.INSTANCE)); } @Test @@ -132,7 +138,8 @@ public void addNewObserverMethodFromReadingExistingOne() { getCurrentManager().getEvent().select(Banana.class, Any.Literal.INSTANCE, Ripe.RipeLiteral.INSTANCE).fire(new Banana()); getCurrentManager().getEvent().select(Melon.class, Any.Literal.INSTANCE).fire(new Melon()); getCurrentManager().getEvent().select(Peach.class, Any.Literal.INSTANCE).fire(new Peach()); - Set> peachEventObservers = getCurrentManager().resolveObserverMethods(new Peach(), Any.Literal.INSTANCE); + Set> peachEventObservers = getCurrentManager().resolveObserverMethods(new Peach(), + Any.Literal.INSTANCE); Set> bananaEventObservers = getCurrentManager() .resolveObserverMethods(new Banana(), Any.Literal.INSTANCE, Ripe.RipeLiteral.INSTANCE); // one in FruitObserver and second one added in AfterBeanDiscoveryObserver @@ -150,8 +157,10 @@ public void addNewObserverMethodFromReadingExistingOne() { @Test @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "dab") public void configuratorInitializedWithOriginalObserverMethod() { - ObserverMethod configuredOne = getCurrentManager().resolveObserverMethods(new Kiwi(), Ripe.RipeLiteral.INSTANCE).iterator().next(); - ObserverMethod originalOne = getCurrentManager().getExtension(ProcessObserverMethodObserver.class).getOriginalOM(); + ObserverMethod configuredOne = getCurrentManager() + .resolveObserverMethods(new Kiwi(), Ripe.RipeLiteral.INSTANCE).iterator().next(); + ObserverMethod originalOne = getCurrentManager().getExtension(ProcessObserverMethodObserver.class) + .getOriginalOM(); assertEquals(configuredOne.getObservedType(), originalOne.getObservedType()); assertEquals(configuredOne.getObservedQualifiers(), originalOne.getObservedQualifiers()); assertEquals(configuredOne.getPriority(), originalOne.getPriority()); @@ -172,8 +181,9 @@ public void syntheticEventInvokedAndReturningSourceTest() { @Test @SpecAssertion(section = OBSERVER_METHOD_CONFIGURATOR, id = "baa") - public void defaultBeanClassIsExtensionClass(){ - Set> papayaEventObservers = getCurrentManager().resolveObserverMethods(new Papaya(), Any.Literal.INSTANCE); + public void defaultBeanClassIsExtensionClass() { + Set> papayaEventObservers = getCurrentManager().resolveObserverMethods(new Papaya(), + Any.Literal.INSTANCE); ObserverMethod papayaObserver = papayaEventObservers.iterator().next(); assertNotNull(papayaObserver, "There is no Papaya Observer available!"); assertEquals(papayaObserver.getBeanClass(), AfterBeanDiscoveryObserver.class); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ProcessObserverMethodObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ProcessObserverMethodObserver.java index 66f36aac18..017851df5a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ProcessObserverMethodObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/observerMethod/ProcessObserverMethodObserver.java @@ -16,6 +16,7 @@ import java.lang.annotation.Annotation; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.event.Observes; import jakarta.enterprise.event.Reception; import jakarta.enterprise.event.TransactionPhase; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/producer/ProducerConfiguratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/producer/ProducerConfiguratorTest.java index 71b8b90a4f..a42b794d66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/producer/ProducerConfiguratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/configurators/producer/ProducerConfiguratorTest.java @@ -16,7 +16,6 @@ import static org.jboss.cdi.tck.TestGroups.CDI_FULL; import static org.jboss.cdi.tck.cdi.Sections.PROCESS_PRODUCER; import static org.jboss.cdi.tck.cdi.Sections.PRODUCER_CONFIGURATOR; -import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; @@ -56,9 +55,9 @@ public static WebArchive createTestArchive() { @Test @SpecAssertions({ - @SpecAssertion(section = PROCESS_PRODUCER, id = "f"), - @SpecAssertion(section = PRODUCER_CONFIGURATOR, id = "a"), - @SpecAssertion(section = PRODUCER_CONFIGURATOR, id = "b") }) + @SpecAssertion(section = PROCESS_PRODUCER, id = "f"), + @SpecAssertion(section = PRODUCER_CONFIGURATOR, id = "a"), + @SpecAssertion(section = PRODUCER_CONFIGURATOR, id = "b") }) public void configuratorOptionsTest() { // verify producer/disposer were changed assertTrue(barInstance.isResolvable()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java index 80af9d9138..fc067f2a20 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/AddDefinitionErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/ProcessBeanObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/ProcessBeanObserver.java index 8be5ef2e77..8132a28d6f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/ProcessBeanObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/ProcessBeanObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/Sheep.java index 4b72c4677e..23ceee1fa4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverRegistersException/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ProcessBeanObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ProcessBeanObserver.java index d182ef01cf..88888f9297 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ProcessBeanObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ProcessBeanObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/Sheep.java index e0de7d7ad1..d41ad850f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java index 772ef95fd2..5afbc8a34b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/container/event/broken/processBeanObserverThrowsException/ThrowExceptionInProcessBeanObserverTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/Custom.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/Custom.java index cabc899f6f..83f91ae6db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/Custom.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/Custom.java @@ -21,6 +21,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/FinalProduct.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/FinalProduct.java index 0c38f3d774..a5b4832000 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/FinalProduct.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/FinalProduct.java @@ -19,7 +19,7 @@ public int ping() { return 1; } - public final void finalMethod(){ + public final void finalMethod() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/InterceptionFactoryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/InterceptionFactoryTest.java index 83844c9eed..4af6eccb78 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/InterceptionFactoryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/InterceptionFactoryTest.java @@ -63,12 +63,14 @@ public static WebArchive createTestArchive() { Product product; @Test - @SpecAssertions({ @SpecAssertion(section = BINDING_INTERCEPTOR_TO_BEAN, id = "c"), @SpecAssertion(section = INTERCEPTION_FACTORY, id = "b"), + @SpecAssertions({ @SpecAssertion(section = BINDING_INTERCEPTOR_TO_BEAN, id = "c"), + @SpecAssertion(section = INTERCEPTION_FACTORY, id = "b"), @SpecAssertion(section = INTERCEPTION_FACTORY, id = "ca") }) public void producedInstanceIsIntercepted() { ActionSequence.reset(); Assert.assertEquals(product.ping(), 4); - ActionSequence.assertSequenceDataEquals(ProductInterceptor1.class, ProductInterceptor2.class, ProductInterceptor3.class); + ActionSequence.assertSequenceDataEquals(ProductInterceptor1.class, ProductInterceptor2.class, + ProductInterceptor3.class); } @Test @@ -76,11 +78,13 @@ public void producedInstanceIsIntercepted() { public void interceptionFactoryBeanIsAvailable() { Bean interceptionFactoryBean = getCurrentManager().resolve(getCurrentManager().getBeans(InterceptionFactory.class)); Assert.assertEquals(Dependent.class, interceptionFactoryBean.getScope()); - Assert.assertEquals(Stream.of(Default.Literal.INSTANCE, Any.Literal.INSTANCE).collect(Collectors.toSet()), interceptionFactoryBean.getQualifiers()); + Assert.assertEquals(Stream.of(Default.Literal.INSTANCE, Any.Literal.INSTANCE).collect(Collectors.toSet()), + interceptionFactoryBean.getQualifiers()); } @Test - @SpecAssertions({ @SpecAssertion(section = BINDING_INTERCEPTOR_TO_BEAN, id = "c"), @SpecAssertion(section = INTERCEPTION_FACTORY, id = "a"), + @SpecAssertions({ @SpecAssertion(section = BINDING_INTERCEPTOR_TO_BEAN, id = "c"), + @SpecAssertion(section = INTERCEPTION_FACTORY, id = "a"), @SpecAssertion(section = INTERCEPTION_FACTORY, id = "b"), @SpecAssertion(section = INTERCEPTION_FACTORY, id = "ca") }) public void producedWithFinalMethodIsIntercepted() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor1.java index 71329babcc..36b3d595cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor1.java @@ -28,6 +28,6 @@ public class ProductInterceptor1 { @AroundInvoke public Object aroundInvoke(InvocationContext invocationContext) throws Exception { ActionSequence.addAction(this.getClass().getSimpleName()); - return (1 + (Integer)invocationContext.proceed()); + return (1 + (Integer) invocationContext.proceed()); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor2.java index c8f1c007d9..983ff379b8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor2.java @@ -28,6 +28,6 @@ public class ProductInterceptor2 { @AroundInvoke public Object aroundInvoke(InvocationContext invocationContext) throws Exception { ActionSequence.addAction(this.getClass().getSimpleName()); - return (1 + (Integer)invocationContext.proceed()); + return (1 + (Integer) invocationContext.proceed()); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor3.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor3.java index 47f59254cb..30054ab2c0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptor3.java @@ -28,6 +28,6 @@ public class ProductInterceptor3 { @AroundInvoke public Object aroundInvoke(InvocationContext invocationContext) throws Exception { ActionSequence.addAction(this.getClass().getSimpleName()); - return (1 + (Integer)invocationContext.proceed()); + return (1 + (Integer) invocationContext.proceed()); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding1.java index 0042287237..9f9ec42135 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding1.java @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding2.java index 90db3623a5..a01962ef6b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding2.java @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding3.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding3.java index 27cdc2e15c..d661b114fa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductInterceptorBinding3.java @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductProducer.java index 0b1a279243..5c515129d8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/ProductProducer.java @@ -24,7 +24,8 @@ public class ProductProducer { @Produces @RequestScoped public Product createInterceptedProduct(InterceptionFactory interceptionFactory) { - interceptionFactory.configure().add(ProductInterceptorBinding3.BindingLiteral.INSTANCE).filterMethods(m -> m.getJavaMember().getName().equals("ping")) + interceptionFactory.configure().add(ProductInterceptorBinding3.BindingLiteral.INSTANCE) + .filterMethods(m -> m.getJavaMember().getName().equals("ping")) .findFirst().get() .add(ProductInterceptorBinding1.BindingLiteral.INSTANCE) .add(ProductInterceptorBinding2.BindingLiteral.INSTANCE); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/BeanWithInvalidInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/BeanWithInvalidInjectionPoint.java index 69c4dcd586..971dc3a863 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/BeanWithInvalidInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/BeanWithInvalidInjectionPoint.java @@ -20,10 +20,11 @@ @ApplicationScoped public class BeanWithInvalidInjectionPoint { - public BeanWithInvalidInjectionPoint(){} + public BeanWithInvalidInjectionPoint() { + } @Inject - public BeanWithInvalidInjectionPoint(InterceptionFactory interceptionFactory){ + public BeanWithInvalidInjectionPoint(InterceptionFactory interceptionFactory) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InterceptedInstanceProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InterceptedInstanceProducer.java index da4cd063d9..15a4597177 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InterceptedInstanceProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InterceptedInstanceProducer.java @@ -24,7 +24,8 @@ public class InterceptedInstanceProducer { @Produces @Dependent - public UnproxyableType attemptToCreateUnproxyableInterceptedInstance(InterceptionFactory interceptionFactory) { + public UnproxyableType attemptToCreateUnproxyableInterceptedInstance( + InterceptionFactory interceptionFactory) { try { return interceptionFactory.createInterceptedInstance(new UnproxyableType()); } catch (UnproxyableResolutionException e) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InvalidInterceptionFactoryInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InvalidInterceptionFactoryInjectionPointTest.java index 411ad72776..ea975e673a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InvalidInterceptionFactoryInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/InvalidInterceptionFactoryInjectionPointTest.java @@ -48,6 +48,7 @@ public static WebArchive createTestArchive() { @Test @SpecAssertion(section = Sections.INTERCEPTION_FACTORY, id = "h") - public void noopTest(){} + public void noopTest() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/UnproxyableType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/UnproxyableType.java index 3a659d2421..bb963b4ec4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/UnproxyableType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/broken/UnproxyableType.java @@ -18,7 +18,7 @@ @Vetoed public class UnproxyableType { - public final void unproxyable(String name){ + public final void unproxyable(String name) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Account.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Account.java index fe50302d1a..710fd43c86 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Account.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Account.java @@ -17,7 +17,7 @@ public class Account { private final int balance = 1000; - public int withdraw(int withdrawal){ - return balance - withdrawal; + public int withdraw(int withdrawal) { + return balance - withdrawal; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/AfterBeanDiscoveryObserver.java index 71b6aa6a10..2d17d26950 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/AfterBeanDiscoveryObserver.java @@ -26,7 +26,7 @@ void observeABD(@Observes AfterBeanDiscovery abd, BeanManager beanManager) { abd.addBean() .addType(Account.class) .addQualifier(Custom.CustomLiteral.INSTANCE) - .createWith((cc) -> { + . createWith((cc) -> { InterceptionFactory factory = beanManager.createInterceptionFactory(cc, Account.class); factory.configure().add(FeeBinding.FeeLiteral.INSTANCE); return factory.createInterceptedInstance(new Account()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Custom.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Custom.java index 815ac82b99..3f5d56a58b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Custom.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/Custom.java @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/CustomBeanWithInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/CustomBeanWithInterceptorTest.java index 57a73c1c01..b98a29dc47 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/CustomBeanWithInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/CustomBeanWithInterceptorTest.java @@ -47,7 +47,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_INTERCEPTION_FACTORY, id = "a"), @SpecAssertion(section = INTERCEPTION_FACTORY, id = "f") }) + @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_INTERCEPTION_FACTORY, id = "a"), + @SpecAssertion(section = INTERCEPTION_FACTORY, id = "f") }) public void customBeanIntercepted() { Account customAccount = getContextualReference(Account.class, Custom.CustomLiteral.INSTANCE); assertNotNull(customAccount); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/FeeBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/FeeBinding.java index ca03d82a85..0bf589dadb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/FeeBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptionFactory/customBean/FeeBinding.java @@ -17,6 +17,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; @@ -26,6 +27,6 @@ public @interface FeeBinding { public static class FeeLiteral extends AnnotationLiteral implements FeeBinding { - public static FeeLiteral INSTANCE = new FeeLiteral(); + public static FeeLiteral INSTANCE = new FeeLiteral(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/BooInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/BooInterceptor.java index 4247a95de7..be314b064e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/BooInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/BooInterceptor.java @@ -24,6 +24,6 @@ public Object interceptFoo(InvocationContext ctx) throws Exception { return "intercepted"; } return ctx.proceed(); -} + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/InterceptorsExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/InterceptorsExtension.java index 7958f1625d..028d6c0205 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/InterceptorsExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/InterceptorsExtension.java @@ -62,7 +62,6 @@ public boolean isAnnotationPresent(Class annotationType) { pat.setAnnotatedType(modifiedSimpleAnnotatedType); - } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/SimpleBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/SimpleBean.java index b141482369..e8ce803863 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/SimpleBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/annotation/SimpleBean.java @@ -20,4 +20,3 @@ public String simpleMethod() { } } - diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/AbstractInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/AbstractInterceptor.java index 30dcb0d3a2..6c10f8c206 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/AbstractInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/AbstractInterceptor.java @@ -27,9 +27,9 @@ /** * Utility class for extension-provided interceptor tests. - * + * * @author Jozef Hartinger - * + * */ public abstract class AbstractInterceptor implements Interceptor { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptor.java index d64a32e596..196470db99 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptor.java @@ -27,7 +27,7 @@ /** * Extension-provided implementation of {@link Interceptor}. Delegates to FooInterceptor (which in real world could represent a * legacy-style interceptor - e.g. Seam 2 interceptor) - * + * * @author Jozef Hartinger */ public class CustomInterceptor extends AbstractInterceptor implements PassivationCapable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorInvocationTest.java index a450c9fc2b..1e19c4b2d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorInvocationTest.java @@ -20,6 +20,7 @@ import jakarta.inject.Inject; import jakarta.interceptor.Interceptor; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -35,11 +36,11 @@ /** * Registers an extension-provided implementation of the {@link Interceptor} interface and verifies that the implementation is * invoked upon invocation of an intercepted method. - * + * *

    * This test was originally part of Weld test suite - WELD-997. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -63,7 +64,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd"), @SpecAssertion(section = INTERCEPTOR, id = "d") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd"), + @SpecAssertion(section = INTERCEPTOR, id = "d") }) public void testCustomInterceptorInvocation() { CustomInterceptor.reset(); FooInterceptor.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java index 7818cf8299..1fd733862b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/CustomInterceptorRegistrationTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.AFTER_BEAN_DISCOVERY; import jakarta.interceptor.Interceptor; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -31,12 +32,12 @@ /** * Registers an extension-provided implementation of the {@link Interceptor} interface. - * + * *

    * This test was originally part of Weld test suite. Causes deployment error on Weld if an intercepted bean is passivation * capable - WELD-996. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptor.java index 5c55ca3f32..4983fc041f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptor.java @@ -19,9 +19,9 @@ /** * This is not an interceptor (it misses required annotations). The CustomInterceptor delegates to instances of this class. - * + * * @author Jozef Hartinger - * + * */ @SuppressWarnings("serial") public class FooInterceptor implements Serializable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptorBinding.java index 8e514351b8..2ffc1477e3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/interceptors/custom/FooInterceptorBinding.java @@ -31,7 +31,8 @@ public @interface FooInterceptorBinding { @SuppressWarnings("all") - public class FooInterceptorBindingLiteral extends AnnotationLiteral implements FooInterceptorBinding { + public class FooInterceptorBindingLiteral extends AnnotationLiteral + implements FooInterceptorBinding { public static final FooInterceptorBindingLiteral INSTANCE = new FooInterceptorBindingLiteral(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/ExtensionLifecycleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/ExtensionLifecycleTest.java index 94e8618b86..7f5bb10611 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/ExtensionLifecycleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/ExtensionLifecycleTest.java @@ -42,7 +42,7 @@ /** * Note that is't not possible to test that container maintains a reference to extension instance until the application shuts * down. - * + * * @author Martin Kouba */ @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryObserver.java index d586972fcd..0db4cfd0da 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AfterTypeDiscoveryObserver.java @@ -17,6 +17,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.Instance; @@ -81,11 +82,12 @@ public void observeAfterTypeDiscovery(@Observes AfterTypeDiscovery event, BeanMa // add Baz annotatedType via AnnotatedTypeConfigurator event.addAnnotatedType(Baz.class, AfterTypeDiscoveryObserver.class.getName() + ":" + Baz.class.getName()) - .add(Pro.ProLiteral.INSTANCE) - .add(RequestScoped.Literal.INSTANCE) - .filterFields(annotatedField -> annotatedField.getJavaMember().getType().equals(Instance.class)).findFirst().get() - .add(InjectLiteral.INSTANCE) - .add(Pro.ProLiteral.INSTANCE); + .add(Pro.ProLiteral.INSTANCE) + .add(RequestScoped.Literal.INSTANCE) + .filterFields(annotatedField -> annotatedField.getJavaMember().getType().equals(Instance.class)).findFirst() + .get() + .add(InjectLiteral.INSTANCE) + .add(Pro.ProLiteral.INSTANCE); // Remove alternative, decorator and interceptor based on Class event.getAlternatives().remove(EchoAlternative.class); 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 f0bbc0a885..2f64687ee7 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 @@ -22,10 +22,12 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.util.List; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -42,8 +44,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - /** * @author Martin Kouba */ @@ -66,7 +66,8 @@ public static WebArchive createTestArchive() { AfterTypeDiscoveryObserver extension; @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "a"), @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "c"), + @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "a"), + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "c"), @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "hb") }) public void testInitialInterceptors() { assertTrue(extension.getInterceptors().contains(BravoInterceptor.class)); @@ -76,7 +77,8 @@ public void testInitialInterceptors() { } @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "b"), @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "ha") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "b"), + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "ha") }) public void testInitialAlternatives() { // frameworks might add their own alternatives, we cannot assert positions in list but rather just ordering assertTrue(extension.getAlternatives().size() >= 3); @@ -103,7 +105,8 @@ public void testInitialAlternatives() { } @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "d"), @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "hc") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "d"), + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "hc") }) public void testInitialDecorators() { // frameworks might add their own decorators, we cannot assert positions in list but rather just ordering assertTrue(extension.getDecorators().size() >= 4); @@ -172,7 +175,8 @@ public void testFinalAlternatives(TransactionLogger logger) { @SuppressWarnings("serial") @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "e"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "d") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "e"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "d") }) public void testAddAnnotatedType() { assertTrue(extension.isBossObserved()); getUniqueBean(Boss.class); @@ -190,18 +194,21 @@ public void testAddAnnotatedType() { public void testAddAnnotatedTypeWithConfigurator() { Bean bazBean = getUniqueBean(Baz.class, Pro.ProLiteral.INSTANCE); assertEquals(bazBean.getScope(), RequestScoped.class); - Baz baz = (Baz) getCurrentManager().getReference(bazBean, Baz.class, getCurrentManager().createCreationalContext(bazBean)); + Baz baz = (Baz) getCurrentManager().getReference(bazBean, Baz.class, + getCurrentManager().createCreationalContext(bazBean)); assertFalse(baz.getBarInstance().isUnsatisfied()); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "ab"), @SpecAssertion(section = PROCESS_PRODUCER, id = "bb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "ab"), + @SpecAssertion(section = PROCESS_PRODUCER, id = "bb") }) public void testProcessProducerEventFiredForProducerField() { assertTrue(extension.isProcessProcuderFieldObserved()); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "aa"), @SpecAssertion(section = PROCESS_PRODUCER, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "aa"), + @SpecAssertion(section = PROCESS_PRODUCER, id = "ba") }) public void testProcessProducerEventFiredForProducerMethod() { assertTrue(extension.isProcessProcuderMethodObserved()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AlphaDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AlphaDecorator.java index 4c5810a0ce..cdaf93e174 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AlphaDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/AlphaDecorator.java @@ -31,6 +31,4 @@ public String log(String msg) { return logger.log(msg + "alpha"); } - - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoDecorator.java index b781d87b22..c5f6ac1eca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoDecorator.java @@ -31,6 +31,4 @@ public String log(String msg) { return logger.log(msg + "bravo"); } - - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoInterceptor.java index edb9282cb7..e54a69f3c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/BravoInterceptor.java @@ -31,7 +31,6 @@ public Object monitor(InvocationContext ctx) throws Exception { return ctx.proceed(); } - public static void reset() { intercepted = false; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieDecorator.java index d87c779ab2..bbbae040cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieDecorator.java @@ -29,6 +29,4 @@ public String log(String msg) { return logger.log(msg + "charlie"); } - - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieInterceptor.java index e59ccb1b84..7be4ba7097 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/CharlieInterceptor.java @@ -29,7 +29,6 @@ public Object monitor(InvocationContext ctx) throws Exception { return ctx.proceed(); } - public static void reset() { intercepted = false; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternative.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternative.java index 8b215d9e45..78537ff81e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternative.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternative.java @@ -13,5 +13,5 @@ */ package org.jboss.cdi.tck.tests.full.extensions.lifecycle.atd; -public class DeltaAlternative implements Alternatives { +public class DeltaAlternative implements Alternatives { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternativeBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternativeBean.java index 4942f8ac2b..0a1af7d7cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternativeBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaAlternativeBean.java @@ -13,18 +13,17 @@ */ package org.jboss.cdi.tck.tests.full.extensions.lifecycle.atd; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.inject.spi.InjectionPoint; - import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.Prioritized; public class DeltaAlternativeBean implements Bean, Prioritized { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecorator.java index 9a2a7a3c7f..fe62a2b51f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecorator.java @@ -24,6 +24,6 @@ public class DeltaDecorator implements Logger { @Override public String log(String string) { - return logger.log(string + "delta"); + return logger.log(string + "delta"); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecoratorBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecoratorBean.java index 2bd72446b6..6e727c47cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecoratorBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaDecoratorBean.java @@ -13,9 +13,6 @@ */ package org.jboss.cdi.tck.tests.full.extensions.lifecycle.atd; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.spi.*; import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Type; @@ -23,7 +20,10 @@ import java.util.HashSet; import java.util.Set; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.Default; +import jakarta.enterprise.inject.spi.*; public class DeltaDecoratorBean implements Decorator, Prioritized { @@ -44,7 +44,7 @@ public Set getDelegateQualifiers() { } public Set getDecoratedTypes() { - return Collections.singleton(Logger.class); + return Collections. singleton(Logger.class); } public Class getBeanClass() { @@ -96,7 +96,8 @@ public boolean isAlternative() { public DeltaDecorator create(CreationalContext creationalContext) { DeltaDecorator decorator = new DeltaDecorator(); - decorator.logger = (Logger) beanManager.getInjectableReference(getInjectionPoints().iterator().next(), creationalContext); + decorator.logger = (Logger) beanManager.getInjectableReference(getInjectionPoints().iterator().next(), + creationalContext); return decorator; } @@ -111,7 +112,7 @@ public Type getType() { } public Set getQualifiers() { - return Collections.singleton(Default.Literal.INSTANCE); + return Collections. singleton(Default.Literal.INSTANCE); } public Bean getBean() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaInterceptorBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaInterceptorBean.java index 351202d483..ab4ef6730e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaInterceptorBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/DeltaInterceptorBean.java @@ -13,22 +13,23 @@ */ package org.jboss.cdi.tck.tests.full.extensions.lifecycle.atd; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.interceptor.InvocationContext; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; public class DeltaInterceptorBean implements Interceptor { public Set getInterceptorBindings() { - return Collections.singleton(Monitored.MonitoredBindingLiteral.INSTANCE); + return Collections. singleton(Monitored.MonitoredBindingLiteral.INSTANCE); } public boolean intercepts(InterceptionType type) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/EchoAlternative.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/EchoAlternative.java index 2e5d77b34b..63164a5403 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/EchoAlternative.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/EchoAlternative.java @@ -23,5 +23,5 @@ @Alternative @Priority(2600) public class EchoAlternative implements Alternatives { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/Monitored.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/Monitored.java index 535aed69cf..48d9b2bb9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/Monitored.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/Monitored.java @@ -13,15 +13,16 @@ */ package org.jboss.cdi.tck.tests.full.extensions.lifecycle.atd; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) @@ -33,4 +34,4 @@ public class MonitoredBindingLiteral extends AnnotationLiteral implem public static final MonitoredBindingLiteral INSTANCE = new MonitoredBindingLiteral(); } -} \ No newline at end of file +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Baz.java index 6d1f99a7f0..04218921f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Baz.java @@ -15,12 +15,11 @@ import jakarta.enterprise.inject.Instance; - public class Baz { Instance barInstance; - public Instance getBarInstance() { + public Instance getBarInstance() { return barInstance; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Pro.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Pro.java index b0c135406d..b84dd8589a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Pro.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/lib/Pro.java @@ -1,39 +1,38 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.atd.lib; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -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 Pro { - - public class ProLiteral extends AnnotationLiteral implements Pro { - - public static ProLiteral INSTANCE = new ProLiteral(); - } - - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.atd.lib; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +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 Pro { + + public class ProLiteral extends AnnotationLiteral implements Pro { + + public static ProLiteral INSTANCE = new ProLiteral(); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/AfterTypeDiscoveryMassOperationsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/AfterTypeDiscoveryMassOperationsTest.java index ec3be329f0..c2c41d0f36 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/AfterTypeDiscoveryMassOperationsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/AfterTypeDiscoveryMassOperationsTest.java @@ -19,6 +19,8 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.util.List; + import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -35,8 +37,6 @@ import org.jboss.test.audit.annotations.SpecAssertions; import org.testng.annotations.Test; -import java.util.List; - /** * Complementary test to AfterTypeDiscoveryTest using the same classes but focusing on mass operations on List * @@ -60,9 +60,9 @@ public static WebArchive createTestArchive() { @Test @SpecAssertions({ - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "a"), - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "c"), - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "hb") }) + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "a"), + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "c"), + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "hb") }) public void testInitialInterceptors() { assertTrue(extension.getInterceptors().contains(AlphaInterceptor.class)); assertTrue(extension.getInterceptors().contains(BetaInterceptor.class)); @@ -71,8 +71,8 @@ public void testInitialInterceptors() { @Test @SpecAssertions({ - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "b"), - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "ha") }) + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "b"), + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "ha") }) public void testInitialAlternatives() { // frameworks might add their own alternatives, we cannot assert positions in list but rather just ordering assertTrue(extension.getAlternatives().size() >= 3); @@ -100,8 +100,8 @@ public void testInitialAlternatives() { @Test @SpecAssertions({ - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "d"), - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "hc") }) + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "d"), + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "hc") }) public void testInitialDecorators() { // frameworks might add their own decorators, we cannot assert positions in list but rather just ordering assertTrue(extension.getDecorators().size() >= 3); @@ -129,7 +129,7 @@ public void testInitialDecorators() { @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "gb") }) + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "gb") }) public void testFinalInterceptors(TransactionLogger logger) { AlphaInterceptor.reset(); @@ -141,21 +141,21 @@ public void testFinalInterceptors(TransactionLogger logger) { assertTrue(AlphaInterceptor.isIntercepted()); assertTrue(BetaInterceptor.isIntercepted()); assertTrue(GammaInterceptor.isIntercepted()); - + assertTrue(extension.containsWorks()); assertTrue(extension.containsAllWorks()); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "gc") }) + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "gc") }) public void testFinalDecorators(TransactionLogger logger) { assertEquals(logger.log("ping"), "pinggamma"); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ - @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "ga") }) + @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "ga") }) public void testFinalAlternatives(TransactionLogger logger) { // assert that proper alternative is injected assertEquals(logger.getAlternativeClass(), GammaAlternative.class); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/BetaAlternative.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/BetaAlternative.java index dfd4b4baba..df32748ca3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/BetaAlternative.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/BetaAlternative.java @@ -25,5 +25,5 @@ @Alternative @Priority(2600) public class BetaAlternative implements Alternatives { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaAlternative.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaAlternative.java index 89972eb6c8..1d93a6d607 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaAlternative.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaAlternative.java @@ -25,5 +25,5 @@ @Alternative @Priority(2700) public class GammaAlternative implements Alternatives { - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaInterceptor.java index 1f311cf561..a1e31c305c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/atd/massOperations/GammaInterceptor.java @@ -28,7 +28,7 @@ @Priority(2700) @Monitored public class GammaInterceptor { - + private static boolean intercepted = false; @AroundInvoke diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Alligator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Alligator.java index 7c69eec4af..fa8fa79030 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Alligator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Alligator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ @Tame public class Alligator { 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 b0f45a9aa2..e9baf886b2 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 @@ -15,6 +15,7 @@ import java.util.HashSet; import java.util.Set; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.Instance; @@ -24,7 +25,6 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; import jakarta.enterprise.inject.spi.Extension; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.Nonbinding; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.bbd.lib.Baz; @@ -113,10 +113,11 @@ public AnnotatedType delegate() { event.addAnnotatedType(Baz.class, BeforeBeanDiscoveryObserver.class.getName() + ":" + Baz.class.getName()) .add(Pro.ProLiteral.INSTANCE) .add(RequestScoped.Literal.INSTANCE) - .filterFields(annotatedField -> annotatedField.getJavaMember().getType().equals(Instance.class)).findFirst().get() + .filterFields(annotatedField -> annotatedField.getJavaMember().getType().equals(Instance.class)).findFirst() + .get() .add(InjectLiteral.INSTANCE) .add(Pro.ProLiteral.INSTANCE); } -} \ No newline at end of file +} 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 60e77b7dbe..ba50ff9b95 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 @@ -23,7 +23,6 @@ import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -121,7 +120,8 @@ public String level() { @SuppressWarnings("serial") @Test - @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "af"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "d") }) + @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "af"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "d") }) public void testAddAnnotatedType() { getUniqueBean(Boss.class); assertEquals(getBeans(Bar.class).size(), 0); @@ -136,7 +136,8 @@ public void testAddAnnotatedType() { public void testAddAnnotatedTypeWithConfigurator() { Bean bazBean = getUniqueBean(Baz.class, Pro.ProLiteral.INSTANCE); assertEquals(bazBean.getScope(), RequestScoped.class); - Baz baz = (Baz) getCurrentManager().getReference(bazBean, Baz.class, getCurrentManager().createCreationalContext(bazBean)); + Baz baz = (Baz) getCurrentManager().getReference(bazBean, Baz.class, + getCurrentManager().createCreationalContext(bazBean)); assertFalse(baz.getBarInstance().isUnsatisfied()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccess.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccess.java index ddd6d84b2a..31c3634fe9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccess.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccess.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessAuthorizationDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessAuthorizationDecorator.java index c9240d5584..db8ad28e52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessAuthorizationDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessAuthorizationDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessImpl.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessImpl.java index 2e4ab5cc37..2757bbba89 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DataAccessImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ public class DataAccessImpl implements DataAccess { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DeploymentTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DeploymentTest.java index fc72046620..050f9e2249 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DeploymentTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DeploymentTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,7 +34,7 @@ /** * Tests related to the final deployment phase of the lifecycle. - * + * * @author David Allen * @author Martin Kouba */ @@ -49,7 +49,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "a"), @SpecAssertion(section = AFTER_DEPLOYMENT_VALIDATION, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "a"), + @SpecAssertion(section = AFTER_DEPLOYMENT_VALIDATION, id = "a") }) public void testDeployedManagerEvent() { assertTrue(ManagerObserver.isAfterDeploymentValidationCalled()); assertTrue(ManagerObserver.isAfterBeanDiscoveryCalled()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DisabledBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DisabledBean.java index 6d9a9926ab..5b6e85ce63 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DisabledBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/DisabledBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/EpochScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/EpochScoped.java index 06473e83b9..7a92993687 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/EpochScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/EpochScoped.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Interceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Interceptor1.java index 0261ed0a02..e326d98f8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Interceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Interceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/InterceptorType1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/InterceptorType1.java index 45e12cd4f3..45b0ab4627 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/InterceptorType1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/InterceptorType1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/ManagerObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/ManagerObserver.java index 0e4098ac98..fb91f65217 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/ManagerObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/ManagerObserver.java @@ -1,48 +1,48 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.bbd; - -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.AfterDeploymentValidation; -import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.enterprise.inject.spi.Extension; - -public class ManagerObserver implements Extension { - private static boolean afterBeanDiscoveryCalled = false; - private static boolean afterDeploymentValidationCalled = false; - - public void managerInitialized(@Observes AfterBeanDiscovery event, BeanManager beanManager) { - afterBeanDiscoveryCalled = true; - } - - public void managerDeployed(@Observes AfterDeploymentValidation event, BeanManager beanManager) { - assert afterBeanDiscoveryCalled : "AfterBeanDiscovery should have been called before AfterDeploymentValidation"; - afterDeploymentValidationCalled = true; - } - - public static boolean isAfterBeanDiscoveryCalled() { - return afterBeanDiscoveryCalled; - } - - public static void reset() { - ManagerObserver.afterBeanDiscoveryCalled = false; - ManagerObserver.afterDeploymentValidationCalled = false; - } - - public static boolean isAfterDeploymentValidationCalled() { - return afterDeploymentValidationCalled; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.bbd; + +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.Extension; + +public class ManagerObserver implements Extension { + private static boolean afterBeanDiscoveryCalled = false; + private static boolean afterDeploymentValidationCalled = false; + + public void managerInitialized(@Observes AfterBeanDiscovery event, BeanManager beanManager) { + afterBeanDiscoveryCalled = true; + } + + public void managerDeployed(@Observes AfterDeploymentValidation event, BeanManager beanManager) { + assert afterBeanDiscoveryCalled : "AfterBeanDiscovery should have been called before AfterDeploymentValidation"; + afterDeploymentValidationCalled = true; + } + + public static boolean isAfterBeanDiscoveryCalled() { + return afterBeanDiscoveryCalled; + } + + public static void reset() { + ManagerObserver.afterBeanDiscoveryCalled = false; + ManagerObserver.afterDeploymentValidationCalled = false; + } + + public static boolean isAfterDeploymentValidationCalled() { + return afterDeploymentValidationCalled; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/NotAuthorizedException.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/NotAuthorizedException.java index 31be7d1a0d..e1bd62106e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/NotAuthorizedException.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/NotAuthorizedException.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Programmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Programmer.java index 29b6c2f8d3..a0ea73b5ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Programmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Programmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/RomanEmpire.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/RomanEmpire.java index c2bb290b96..ec5784a10a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/RomanEmpire.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/RomanEmpire.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ @EpochScoped public class RomanEmpire { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Skill.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Skill.java index 02e9aef1c3..47c7c19f86 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Skill.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/Skill.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,13 +17,15 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; import java.lang.annotation.Target; @Retention(RUNTIME) -@Target({METHOD, FIELD, PARAMETER, TYPE}) +@Target({ METHOD, FIELD, PARAMETER, TYPE }) public @interface Skill { String language(); + String level(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/SkillLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/SkillLiteral.java index 156541f8a0..321f6c820a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/SkillLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/SkillLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 5b107c75c5..0ae6e43661 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 @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.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; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -public @interface Tame { - class Literal extends AnnotationLiteral implements Tame { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.bbd; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.util.AnnotationLiteral; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@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/lifecycle/bbd/User.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/User.java index 075f5a8e7e..4ac0576dbc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/User.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/User.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryObserver.java index 8e1f96871f..e85b67f6d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ public class BeforeBeanDiscoveryObserver implements Extension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryThrowsExceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryThrowsExceptionTest.java index a48f427808..581514b97f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryThrowsExceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/exception/BeforeBeanDiscoveryThrowsExceptionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/AddingNormalScopeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/AddingNormalScopeTest.java index 1c041d903a..ebb69b4fa4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/AddingNormalScopeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/AddingNormalScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ import org.testng.annotations.Test; /** - * + * * @author pmuir * @author Martin Kouba */ @@ -49,7 +49,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "ac"), @SpecAssertion(section = UNPROXYABLE, id = "baa") }) + @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "ac"), + @SpecAssertion(section = UNPROXYABLE, id = "baa") }) public void testAddingScopeType() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/BeforeBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/BeforeBeanDiscoveryObserver.java index 7417aeac5c..2403ebcd6f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/BeforeBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/BeforeBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ public class BeforeBeanDiscoveryObserver implements Extension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/Caesar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/Caesar.java index 19963073fd..9578593643 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/Caesar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/Caesar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/EpochScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/EpochScoped.java index 442f995a2e..e6cb128b3a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/EpochScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/EpochScoped.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/RomanEmpire.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/RomanEmpire.java index 3d3e15ef5f..1427d7108f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/RomanEmpire.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/normalScope/RomanEmpire.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ @EpochScoped public final class RomanEmpire { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/AddingPassivatingScopeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/AddingPassivatingScopeTest.java index df06bc7fa4..02a1a17d53 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/AddingPassivatingScopeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/AddingPassivatingScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -31,7 +32,7 @@ import org.testng.annotations.Test; /** - * + * * @author pmuir * @author Martin Kouba */ @@ -48,7 +49,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "ac"), @SpecAssertion(section = PASSIVATION_VALIDATION, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "ac"), + @SpecAssertion(section = PASSIVATION_VALIDATION, id = "a") }) public void testAddingScopeType() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/BeforeBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/BeforeBeanDiscoveryObserver.java index fc175393da..dc82b8a812 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/BeforeBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/BeforeBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,7 +19,7 @@ /** * @author pmuir - * + * */ public class BeforeBeanDiscoveryObserver implements Extension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/EpochScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/EpochScoped.java index e2dc7d5911..77b6363ba5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/EpochScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/EpochScoped.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/RomanEmpire.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/RomanEmpire.java index 3d1469637f..02f98546fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/RomanEmpire.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/broken/passivatingScope/RomanEmpire.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * @author pmuir - * + * */ @EpochScoped public class RomanEmpire { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Baz.java index b2004399db..7088294b31 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Baz.java @@ -19,7 +19,7 @@ public class Baz { Instance barInstance; - public Instance getBarInstance() { + public Instance getBarInstance() { return barInstance; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Pro.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Pro.java index bb57be70a8..4d346ae585 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Pro.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/bbd/lib/Pro.java @@ -1,38 +1,38 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.bbd.lib; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -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 Pro { - - public class ProLiteral extends AnnotationLiteral implements Pro { - - public static ProLiteral INSTANCE = new ProLiteral(); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.bbd.lib; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +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 Pro { + + public class ProLiteral extends AnnotationLiteral implements Pro { + + public static ProLiteral INSTANCE = new ProLiteral(); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java index d6c68812c7..8ddd2324af 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ /** * Tests that any definition error added by an observer of the AfterBeanDiscovery event results in a definition error. - * + * * @author David Allen * @author Dan Allen * @author Martin Kouba @@ -51,7 +51,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "ca"), @SpecAssertion(section = INITIALIZATION, id = "e") }) + @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "ca"), + @SpecAssertion(section = INITIALIZATION, id = "e") }) public void testObserverDefinitionErrorTreatedAsDefinitionError() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AfterBeanDiscoveryObserver.java index 369be17d0e..53b3f22ab2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDefinitionError/AfterBeanDiscoveryObserver.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.addDefinitionError; - -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.Extension; - -public class AfterBeanDiscoveryObserver implements Extension { - - public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { - event.addDefinitionError(new AssertionError("This error should be treated as a definition error")); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.addDefinitionError; + +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Extension; + +public class AfterBeanDiscoveryObserver implements Extension { + + public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { + event.addDefinitionError(new AssertionError("This error should be treated as a definition error")); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java index 5a251c5334..bef50df65a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ /** * Tests that a deployment error registered by an observer of the AfterDeploymentValidation event results in a deployment error, * but that all observers that observe this event are still called. - * + * * @author David Allen * @author Dan Allen * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AfterDeploymentValidationObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AfterDeploymentValidationObserver.java index 1485173cc8..d30363c3fc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AfterDeploymentValidationObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/addDeploymentProblem/AfterDeploymentValidationObserver.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.addDeploymentProblem; - -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterDeploymentValidation; -import jakarta.enterprise.inject.spi.Extension; - -public class AfterDeploymentValidationObserver implements Extension { - - public void afterDeploymentValidation(@Observes AfterDeploymentValidation event) { - event.addDeploymentProblem(new AssertionError("This error should be treated as a deployment error")); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.addDeploymentProblem; + +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.Extension; + +public class AfterDeploymentValidationObserver implements Extension { + + public void afterDeploymentValidation(@Observes AfterDeploymentValidation event) { + event.addDeploymentProblem(new AssertionError("This error should be treated as a deployment error")); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/AfterBeanDiscoveryObserverExecutionFailureTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/AfterBeanDiscoveryObserverExecutionFailureTest.java index c095a997a2..8eb18009d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/AfterBeanDiscoveryObserverExecutionFailureTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/AfterBeanDiscoveryObserverExecutionFailureTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,7 +31,7 @@ /** * Tests that any exception raised in a method observing the AfterBeanDiscovery event results in a definition error. - * + * * @author David Allen * @author Dan Allen * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/BeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/BeanDiscoveryObserver.java index 8589dbadae..6f181fdeae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/BeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/BeanDiscoveryObserver.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.exception.discovery; - -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.Extension; - -public class BeanDiscoveryObserver implements Extension { - public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { - throw new FooException("This error should be treated as a definition error"); - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.exception.discovery; + +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Extension; + +public class BeanDiscoveryObserver implements Extension { + public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { + throw new FooException("This error should be treated as a definition error"); + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/FooException.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/FooException.java index 8b293dee19..55742a4c0c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/FooException.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/discovery/FooException.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,13 +15,13 @@ /** * @author pmuir - * + * */ public class FooException extends RuntimeException { /** - * - */ + * + */ private static final long serialVersionUID = 4441409975741605270L; public FooException() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/AfterDeploymentValidationObserverExecutionFailureTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/AfterDeploymentValidationObserverExecutionFailureTest.java index 26daa2fab2..da685364f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/AfterDeploymentValidationObserverExecutionFailureTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/AfterDeploymentValidationObserverExecutionFailureTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ /** * Tests that any failure in an observer observing the AfterDeploymentValidation event results in a deployment error. - * + * * @author David Allen * @author Dan Allen * @author Martin Kouba diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/ValidationObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/ValidationObserver.java index 9400bb5e5b..05c5d398c8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/ValidationObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/exception/validation/ValidationObserver.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.exception.validation; - -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterDeploymentValidation; -import jakarta.enterprise.inject.spi.Extension; - -public class ValidationObserver implements Extension { - public void afterDeploymentValidation(@Observes AfterDeploymentValidation event) { - throw new AssertionError("This error should be treated as a deployment error"); - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.exception.validation; + +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterDeploymentValidation; +import jakarta.enterprise.inject.spi.Extension; + +public class ValidationObserver implements Extension { + public void afterDeploymentValidation(@Observes AfterDeploymentValidation event) { + throw new AssertionError("This error should be treated as a deployment error"); + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/AfterBeanDiscoveryObserver.java index 458c9767fb..073905038b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/AfterBeanDiscoveryObserver.java @@ -1,36 +1,35 @@ -/* - * Copyright 2016, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.observerMethod; - -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.spi.AfterBeanDiscovery; -import jakarta.enterprise.inject.spi.Extension; -import jakarta.enterprise.inject.spi.ObserverMethod; -import jakarta.enterprise.inject.spi.ProcessObserverMethod; - -public class AfterBeanDiscoveryObserver implements Extension { - - private ObserverMethod fooObserverMethod; - - - void observePOM(@Observes ProcessObserverMethod event){ - fooObserverMethod = event.getObserverMethod(); - } - - public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { - // not overriding notify method -> definition error - event.addObserverMethod().read(fooObserverMethod).async(true).priority(ObserverMethod.DEFAULT_PRIORITY); - } - -} +/* + * Copyright 2016, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.extensions.lifecycle.broken.observerMethod; + +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.spi.AfterBeanDiscovery; +import jakarta.enterprise.inject.spi.Extension; +import jakarta.enterprise.inject.spi.ObserverMethod; +import jakarta.enterprise.inject.spi.ProcessObserverMethod; + +public class AfterBeanDiscoveryObserver implements Extension { + + private ObserverMethod fooObserverMethod; + + void observePOM(@Observes ProcessObserverMethod event) { + fooObserverMethod = event.getObserverMethod(); + } + + public void afterBeanDiscovery(@Observes AfterBeanDiscovery event) { + // not overriding notify method -> definition error + event. addObserverMethod().read(fooObserverMethod).async(true).priority(ObserverMethod.DEFAULT_PRIORITY); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/CustomObserverMethodWithoutNotifyMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/CustomObserverMethodWithoutNotifyMethodTest.java index 0222f6ad0a..d60b8dea9f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/CustomObserverMethodWithoutNotifyMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/CustomObserverMethodWithoutNotifyMethodTest.java @@ -37,7 +37,7 @@ @Test(groups = CDI_FULL) @SpecVersion(spec = "cdi", version = "2.0") public class CustomObserverMethodWithoutNotifyMethodTest extends AbstractTest { - + @Deployment @ShouldThrowException(DefinitionException.class) public static WebArchive createSecondTestArchive() { @@ -46,7 +46,7 @@ public static WebArchive createSecondTestArchive() { .withClasses(ExtensionAddingCustomObserverMethod.class, Foo.class) .withExtension(ExtensionAddingCustomObserverMethod.class).build(); } - + @Test @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "ec") }) public void observerCustomMethodNotOverridingNotifyMethodTreatedAsDefinitionError() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/FooObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/FooObserver.java index b9e8b7b8c6..bef2b6a9ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/FooObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/FooObserver.java @@ -19,7 +19,7 @@ @ApplicationScoped public class FooObserver { - public void observeFoo(@Observes Foo foo){ + public void observeFoo(@Observes Foo foo) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/ObserverMethodWithoutNotifyMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/ObserverMethodWithoutNotifyMethodTest.java index 957fcec6b0..acbdd16189 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/ObserverMethodWithoutNotifyMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/broken/observerMethod/ObserverMethodWithoutNotifyMethodTest.java @@ -42,7 +42,8 @@ public class ObserverMethodWithoutNotifyMethodTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(ObserverMethodWithoutNotifyMethodTest.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) - .withClasses(AfterBeanDiscoveryObserver.class, Foo.class, FooObserver.class).withExtension(AfterBeanDiscoveryObserver.class) + .withClasses(AfterBeanDiscoveryObserver.class, Foo.class, FooObserver.class) + .withExtension(AfterBeanDiscoveryObserver.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Alpha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Alpha.java index 7be7f998f8..7cfcae6226 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Alpha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Alpha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaQualifier.java index 5a6f197604..da40ed2e6d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaStereotype.java index 74e74fb96d..a5d14b98de 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/AlphaStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Bravo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Bravo.java index c50dcc8acc..b0600b02b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Bravo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Bravo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoDecorator.java index 6e3d4e8f72..0d28880134 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptor.java index 8e4e3534ee..eca656482d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptorBinding.java index 1a5c76a2fe..d7f221b329 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterface.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterface.java index 65a03f169b..bd54d877fa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterface.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoProducer.java index b07ea17e33..fb86f041b8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoQualifier.java index 5b91c535e5..d1ca767799 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/BravoQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Charlie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Charlie.java index 0221d86dd1..2ccc5690e3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Charlie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Charlie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieInterface.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieInterface.java index 467e11e525..ac2bf3e53f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieInterface.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieProducer.java index 451c39d106..9dadcb1c38 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieQualifier.java index ee0fee1e8c..835bdc1b51 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/CharlieQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Mike.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Mike.java index 6f15730414..76c1519ae1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Mike.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/Mike.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java index a4db8c3734..787fe303a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyValuesTest.java @@ -22,6 +22,8 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import java.lang.annotation.Annotation; + import jakarta.decorator.Decorator; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; @@ -34,6 +36,7 @@ import jakarta.enterprise.inject.spi.BeanAttributes; import jakarta.inject.Inject; import jakarta.inject.Named; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -45,12 +48,10 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Annotation; - /** - * + * * This test was originally part of Weld test suite. - * + * * * @author Jozef Hartinger * @author Martin Kouba @@ -67,8 +68,9 @@ public static WebArchive createTestArchive() { WebArchive archive = new WebArchiveBuilder() .withTestClassPackage(VerifyValuesTest.class) .withBeansXml( - new BeansXml(BeanDiscoveryMode.ALL).alternatives(Alpha.class, BravoProducer.class, CharlieProducer.class) - .interceptors(BravoInterceptor.class).decorators(BravoDecorator.class)) + new BeansXml(BeanDiscoveryMode.ALL) + .alternatives(Alpha.class, BravoProducer.class, CharlieProducer.class) + .interceptors(BravoInterceptor.class).decorators(BravoDecorator.class)) .withExtension(VerifyingExtension.class).build(); return archive; } @@ -98,7 +100,8 @@ public void testProducerMethodAnnotated() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jc") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jc") }) public void testProducerMethodBeanAttributes() { BeanAttributes attributes = extension.getProducedBravoAttributes(); assertNotNull(attributes); @@ -124,7 +127,8 @@ public void testProducerFieldAnnotated() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jc") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jc") }) public void testProducerFieldBeanAttributes() { BeanAttributes attributes = extension.getProducedCharlieAttributes(); assertNotNull(attributes); @@ -138,7 +142,8 @@ public void testProducerFieldBeanAttributes() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ab"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ab"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) public void testInterceptorBeanAttributes() { BeanAttributes attributes = extension.getBravoInterceptorAttributes(); assertNotNull(attributes); @@ -150,7 +155,8 @@ public void testInterceptorBeanAttributes() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ac"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ac"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) public void testDecoratorBeanAttributes() { BeanAttributes attributes = extension.getBravoDecoratorAttributes(); assertNotNull(attributes); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyingExtension.java index 81a8acc9a4..f1579113ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorExtension.java index 874c6aef68..a0e74300d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorTest.java index c3e629fc38..337cb536aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/AddDefinitionErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/BrokenException.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/BrokenException.java index 8c5db6f164..81213c9245 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/BrokenException.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/BrokenException.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/Duke.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/Duke.java index a73a7e698b..9a9025a3ee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/Duke.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/Duke.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionExtension.java index 4e64edc9f4..c8b815f050 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionTest.java index a9926865f2..ae4488c104 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/ThrowExceptionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierExtension.java index cf6dc9babf..f8a7aa55c2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierTest.java index 3ab175554a..f5c8c4a6db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidQualifierTest.java @@ -46,7 +46,8 @@ public class InvalidQualifierTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(InvalidQualifierTest.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) - .withClasses(Telephone.class, PlainOldAnnotation.class, InvalidQualifierExtension.class).withExtension(InvalidQualifierExtension.class).build(); + .withClasses(Telephone.class, PlainOldAnnotation.class, InvalidQualifierExtension.class) + .withExtension(InvalidQualifierExtension.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeExtension.java index 71cf971371..20c455b12a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeTest.java index 63deedc715..44762ed278 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeExtension.java index 0d2ba48c03..148ea47f51 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ public void modify(@Observes ProcessBeanAttributes event) { @Override public Set> getStereotypes() { - return Collections.>singleton(PlainOldAnnotation.class); + return Collections.> singleton(PlainOldAnnotation.class); } @Override diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeTest.java index c2deb9d02a..5934a2d143 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidStereotypeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesExtension.java index c2c39e87bd..2175373e5e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesTest.java index 75d9d53c4f..2e3e1daa56 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/InvalidTypesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/PlainOldAnnotation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/PlainOldAnnotation.java index 19ff607d80..7220dbb69d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/PlainOldAnnotation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/PlainOldAnnotation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/Telephone.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/Telephone.java index 82e299bea4..f156657b8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/Telephone.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/invalid/Telephone.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Bicycle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Bicycle.java index b5988a889c..08ed8b382e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Bicycle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Bicycle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension1.java index ae714e968e..9ed410e3c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension2.java index 927f0ea608..ca7cd03192 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/ModifyingExtension2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/PassivationCapabilityErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/PassivationCapabilityErrorTest.java index a991c6f977..9451ffc28c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/PassivationCapabilityErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/PassivationCapabilityErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,7 +34,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Wheel.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Wheel.java index 2eb63fb7c1..399f86d968 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Wheel.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/broken/passivation/Wheel.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Alpha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Alpha.java index 00bcf02ed3..ec503bf0ae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Alpha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Alpha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/AlphaDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/AlphaDecorator.java index 486bb4563e..58cf98339b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/AlphaDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/AlphaDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Bravo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Bravo.java index 83ee4fa2b0..1d628bd18e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Bravo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Bravo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/BravoDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/BravoDecorator.java index 8ce410444d..75b782e22b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/BravoDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/BravoDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Charlie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Charlie.java index 000d43de0a..35adc1efa7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Charlie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/Charlie.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public class Charlie implements Alpha, Bravo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java index d859592255..fbbddc16e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/DecoratorProcessBeanAttributesTest.java @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/VerifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/VerifyingExtension.java index b013ccb4ee..94b7d56762 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/VerifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/decorator/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/IgnoringExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/IgnoringExtension.java index 8dbea42ed7..1e98fc0101 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/IgnoringExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/IgnoringExtension.java @@ -19,7 +19,7 @@ public class IgnoringExtension implements Extension { - void observesPBA(@Observes ProcessBeanAttributes event){ + void observesPBA(@Observes ProcessBeanAttributes event) { event.ignoreFinalMethods(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/Qux.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/Qux.java index 70ee1542a6..f111201430 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/Qux.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/ignoreFinalMethods/Qux.java @@ -18,11 +18,11 @@ @ApplicationScoped public class Qux { - public boolean ping(){ + public boolean ping() { return true; } - public final void pong2(){ + public final void pong2() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptor.java index fe6e789a46..5ae043ce2b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptorBinding.java index b751efe55e..4f838e681c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/AlphaInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptor.java index c605e73134..be4816d963 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptorBinding.java index 4520b562ae..083af33c4b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/BravoInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java index c2b7514b9d..f597556e88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/InterceptorProcessBeanAttributesTest.java @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @Test(groups = CDI_FULL) @@ -43,7 +43,8 @@ public static WebArchive createTestArchive() { .withClasses(VerifyingExtension.class, AlphaInterceptor.class, AlphaInterceptorBinding.class) .withExtension(VerifyingExtension.class) .withBeanLibrary(BravoInterceptor.class, BravoInterceptorBinding.class) - .withBeanLibrary(new BeansXml(BeanDiscoveryMode.ALL).interceptors(AlphaInterceptor.class, BravoInterceptor.class)) + .withBeanLibrary( + new BeansXml(BeanDiscoveryMode.ALL).interceptors(AlphaInterceptor.class, BravoInterceptor.class)) .withBeansXml(new BeansXml().interceptors(AlphaInterceptor.class, BravoInterceptor.class)) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/VerifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/VerifyingExtension.java index 9407c281e2..897373a9dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/VerifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/interceptor/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Animal.java index e4aa1f4b07..a80536cbdc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Cute.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Cute.java index 81269edf36..2630c57b54 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Cute.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Cute.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/PersianStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/PersianStereotype.java index ee2a15688d..0e66e9e3f2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/PersianStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/PersianStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java index bee174f74c..b377410a5f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/SetBeanAttributesTest.java @@ -60,7 +60,8 @@ public static WebArchive createTestArchive() { ModifyingExtension extension; @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bc"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ca") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bc"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ca") }) public void testBeanModified() { assertEquals(getCurrentManager().getBeans(Cat.class, Default.Literal.INSTANCE).size(), 0); @@ -75,7 +76,8 @@ public void testBeanModified() { assertTypeSetMatches(bean.getTypes(), Object.class, Cat.class); assertTypeSetMatches(bean.getStereotypes(), PersianStereotype.class); - assertTrue(annotationSetMatches(bean.getQualifiers(), new Wild.Literal(true), new Cute.Literal(), Any.Literal.INSTANCE)); + assertTrue( + annotationSetMatches(bean.getQualifiers(), new Wild.Literal(true), new Cute.Literal(), Any.Literal.INSTANCE)); // other attributes assertEquals(ApplicationScoped.class, bean.getScope()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Wild.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Wild.java index 2d494a9980..2a8d167949 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Wild.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/modify/Wild.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Alpha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Alpha.java index b55ff79a22..91858aa072 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Alpha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Alpha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bar.java index 0ad5184e98..12a781b2ed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Baz.java index 705d445963..f06b965e19 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bravo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bravo.java index 6fc24f2ab4..8f7129c310 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bravo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Bravo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Charlie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Charlie.java index 887044c098..0d1851a05e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Charlie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Charlie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Foo.java index 0427dcf78b..517eca1f48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/SpecializationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/SpecializationTest.java index 7354195383..1a914d5a5c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/SpecializationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/SpecializationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -40,7 +40,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -61,7 +61,8 @@ public static WebArchive createTestArchive() { private VerifyingExtension extension; @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), @SpecAssertion(section = SPECIALIZATION, id = "ca") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), + @SpecAssertion(section = SPECIALIZATION, id = "ca") }) public void testProcessBeanAttributesFiredProperlyForSpecializedBean() { assertNull(extension.getAlpha()); assertNull(extension.getBravo()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VerifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VerifyingExtension.java index 751a87283a..803078599e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VerifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoTest.java index 4a8e994a8e..b4f988d33b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -47,19 +47,21 @@ public class VetoTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(VetoTest.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) - .withClasses(Alpha.class, Bar.class, Baz.class, Bravo.class, Foo.class, Charlie.class, VetoingExtension.class, VerifyingExtension.class) + .withClasses(Alpha.class, Bar.class, Baz.class, Bravo.class, Foo.class, Charlie.class, VetoingExtension.class, + VerifyingExtension.class) .withExtensions(VetoingExtension.class, VerifyingExtension.class).build(); } @Inject @Any Alpha alpha; - + @Inject private VerifyingExtension extension; @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "be"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "be"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), @SpecAssertion(section = SPECIALIZATION, id = "ca") }) public void testSpecializedBeanAvailableAfterSpecializingBeanVetoed() { Bean bean = getUniqueBean(Alpha.class, Any.Literal.INSTANCE); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoingExtension.java index 6ef77a5207..9efe98d5b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/VetoingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specialized.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specialized.java index 801fcba076..5c6fce01e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specialized.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specialized.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specializing.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specializing.java index 4289b01fb6..5e1a64a0cb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specializing.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/Specializing.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeConflictDetectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeConflictDetectionTest.java index 8afb406b41..039cf63f31 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeConflictDetectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeConflictDetectionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,14 +33,15 @@ /** * The spec says: - * "If X does not have some bean type of Y, the container automatically detects the problem and treats it as a definition error." - * + * "If X does not have some bean type of Y, the container automatically detects the problem and treats it as a definition + * error." + * * This test verifies, that such problem is detected if the set of types of X is altered by a portable extension. - * + * *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -58,7 +59,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "l") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), + @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "l") }) public void testDeployment() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeExtension.java index 59d2d23b6f..1011183387 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/specialization/broken/TypeExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/ProcessBeanAttributesNotFiredForSyntheticBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/ProcessBeanAttributesNotFiredForSyntheticBeanTest.java index 2adf707d27..ce4202dbd2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/ProcessBeanAttributesNotFiredForSyntheticBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/ProcessBeanAttributesNotFiredForSyntheticBeanTest.java @@ -64,7 +64,8 @@ public static WebArchive createTestArchive() { BicycleExtension bicycleExtension; @Test - @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_BEANATTRIBUTES, id = "a"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ae"), + @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_BEANATTRIBUTES, id = "a"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ae"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "bc") }) public void testProcessBeanAttributesNotFired() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/Vehicle.java index 9ec0344b78..0b0303db00 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/synthetic/Vehicle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Car.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Car.java index f051eb7d27..1f42b8523b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Car.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Car.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Factory.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Factory.java index 624c532598..0f518dc0dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Factory.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Factory.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Field.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Field.java index e9c7e1f09c..550e03ca2b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Field.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Field.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,9 +17,9 @@ /** * This bean is vetoed in the ProcessBeanAttributes phase. - * + * * @author Jozef Hartinger - * + * */ public class Field { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Flower.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Flower.java index 8e6274b103..de9018844f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Flower.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Flower.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoTest.java index e8f6244126..1d8defd70e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,7 +31,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoingExtension.java index a8bacd3576..0b91580f70 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/VetoingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Wheat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Wheat.java index 7e5d60311b..adda18f72b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Wheat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processBeanAttributes/veto/Wheat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Alpha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Alpha.java index 1cfee76c8b..9487c13e9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Alpha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Alpha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bar.java index 7381487ccb..624997b0e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bravo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bravo.java index 317039d4c8..f9e1cc723a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bravo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Bravo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Charlie.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Charlie.java index e3ac1e91fa..d5c75ea0a5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Charlie.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Charlie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Foo.java index b423598105..5e01a0b102 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/InjectingBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/InjectingBean.java index 8adcc7cdaa..0d5b351404 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/InjectingBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/InjectingBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -37,8 +37,8 @@ public void init(@PlainAnnotation Charlie charlie) { public ProducedBean produce(@PlainAnnotation @Foo Alpha alpha, @PlainAnnotation @Bar Bravo bravo) { return null; } - - public void destroy(@Disposes ProducedBean producedBean, Delta delta){ + + public void destroy(@Disposes ProducedBean producedBean, Delta delta) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/PlainAnnotation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/PlainAnnotation.java index 5fc7dcf177..019e65c0d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/PlainAnnotation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/PlainAnnotation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProcessInjectionPointFiredTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProcessInjectionPointFiredTest.java index 912c2349ac..9a2cfc893a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProcessInjectionPointFiredTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProcessInjectionPointFiredTest.java @@ -42,9 +42,9 @@ import org.testng.annotations.Test; /** - * + * * This test was originally part of Weld test suite. - * + * * * @author Jozef Hartinger * @author Martin Kouba @@ -66,8 +66,10 @@ public static WebArchive createTestArchive() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba"), - @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "e"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "ja") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), + @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "e"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "ja") }) public void testFieldInjectionPoint() { InjectionPoint ip = extension.getAlpha(); assertNotNull(ip); @@ -83,8 +85,10 @@ public void testFieldInjectionPoint() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba"), - @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "e"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "ja") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), + @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "e"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "ja") }) public void testConstructorInjectionPoint() { InjectionPoint ip = extension.getBravo(); assertNotNull(ip); @@ -100,7 +104,8 @@ public void testConstructorInjectionPoint() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), + @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "e") }) public void testInitializerInjectionPoint() { InjectionPoint ip = extension.getCharlie(); @@ -117,7 +122,8 @@ public void testInitializerInjectionPoint() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), + @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba") }) public void testProducerMethodInjectionPoint1() { InjectionPoint ip = extension.getProducerAlpha(); assertNotNull(ip); @@ -133,7 +139,8 @@ public void testProducerMethodInjectionPoint1() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), + @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "ba") }) public void testProducerMethodInjectionPoint2() { InjectionPoint ip = extension.getProducerBravo(); assertNotNull(ip); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProducedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProducedBean.java index ebf444b720..ff542107dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProducedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/ProducedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/VerifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/VerifyingExtension.java index 73be60547a..e9ad4561f2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/VerifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/VerifyingExtension.java @@ -128,5 +128,4 @@ public InjectionPoint getDisposerDeltaIp() { return disposerDeltaIp; } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorExtension.java index 3eb55b9424..bcd9c98abf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorTest.java index fe94593501..aeaf94dd97 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/AddDefinitionErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/BrokenException.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/BrokenException.java index 8ec609ce30..83a1a1290f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/BrokenException.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/BrokenException.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/Duke.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/Duke.java index 38014ce20c..0e2166263a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/Duke.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/Duke.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionExtension.java index 9473b53fb6..7f86182f78 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionTest.java index b5c9bfc189..e44f0d39d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/ThrowExceptionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/World.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/World.java index c175bdee0e..cdbe0aab13 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/World.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/broken/World.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Animal.java index 7fd43aa92c..bd91ac936b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/AnimalDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/AnimalDecorator.java index 67aa3d8e48..279d3affed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/AnimalDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/AnimalDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Dog.java index 8b003ec778..87f68be0aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Fast.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Fast.java index 2f91d7ba06..e8bef3401d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Fast.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Fast.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Hound.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Hound.java index cfa08e4861..d7ea42241f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Hound.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Hound.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectingBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectingBean.java index 279e51bc5e..6b3fc48f0d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectingBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectingBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java index e6456b0ba3..17a3a1e376 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/InjectionPointOverridingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -35,7 +35,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -63,14 +63,16 @@ public static WebArchive createTestArchive() { Dog dog; @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "bb"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), + @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "bb"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "c") }) public void testOverridingFieldInjectionPoint() { assertTrue(bean.getDog() instanceof Hound); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "bb"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "a"), + @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "bb"), @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "c") }) public void testDelegateInjectionPoint() { assertNotNull(hound); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Lazy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Lazy.java index 531512cfb7..4cefb114d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Lazy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/Lazy.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/ModifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/ModifyingExtension.java index 348269bcf3..0aa377bc1b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/ModifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lifecycle/processInjectionPoint/modify/ModifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lite/coexistence/BuildCompatibleExtensionSmokeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lite/coexistence/BuildCompatibleExtensionSmokeTest.java index e1a359d015..a05c1c83da 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lite/coexistence/BuildCompatibleExtensionSmokeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/lite/coexistence/BuildCompatibleExtensionSmokeTest.java @@ -18,8 +18,6 @@ import org.jboss.cdi.tck.TestGroups; import org.jboss.cdi.tck.cdi.Sections; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; -import org.jboss.cdi.tck.tests.full.extensions.lifecycle.ExtensionLifecycleTest; -import org.jboss.cdi.tck.tests.full.extensions.lifecycle.SimpleExtension; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.impl.BeansXml; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventA.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventA.java index 7039060194..7efe81bf82 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventA.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventA.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventBObserverMethod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventBObserverMethod.java index ea8b87629f..eb5df6badb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventBObserverMethod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventBObserverMethod.java @@ -23,7 +23,7 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.ObserverMethod; -public class EventBObserverMethod implements ObserverMethod{ +public class EventBObserverMethod implements ObserverMethod { @Override public Class getBeanClass() { return EventObserver.class; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventObserver.java index 14c67eb4b0..64e2487e55 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/EventObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodEventTest.java index 1e395b15ac..91b4ed0a9f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodEventTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -53,7 +53,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "aaa"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "kb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "aaa"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "kb") }) public void testProcessObserverMethodEventsSent() { Assert.assertTrue(ProcessObserverMethodObserver.getEventtypes().contains(EventA.class)); } @@ -61,12 +62,13 @@ public void testProcessObserverMethodEventsSent() { @Test @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "aba") public void testGetAnnotatedMethod() { - Assert.assertEquals(ProcessObserverMethodObserver.getAnnotatedMethod().getParameters().iterator().next().getBaseType() - , (EventA.class)); + Assert.assertEquals(ProcessObserverMethodObserver.getAnnotatedMethod().getParameters().iterator().next().getBaseType(), + (EventA.class)); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "ba"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "kb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "ba"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "kb") }) public void testGetObserverMethod() { Assert.assertEquals(ProcessObserverMethodObserver.getObserverMethod().getObservedType(), (EventA.class)); } @@ -74,14 +76,16 @@ public void testGetObserverMethod() { @Test @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "daa") }) public void replaceWithSetObserverMethod() { - Set> observerMethods = getCurrentManager().resolveObserverMethods(new EventC(), Any.Literal.INSTANCE); + Set> observerMethods = getCurrentManager().resolveObserverMethods(new EventC(), + Any.Literal.INSTANCE); Assert.assertEquals(observerMethods.size(), 1); } @Test @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "dad") }) public void vetoEventD() { - Set> observerMethods = getCurrentManager().resolveObserverMethods(new EventD(), Any.Literal.INSTANCE); + Set> observerMethods = getCurrentManager().resolveObserverMethods(new EventD(), + Any.Literal.INSTANCE); Assert.assertEquals(observerMethods.size(), 0); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodObserver.java index 3a82bd0387..19d0f5adc0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/ProcessObserverMethodObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventB.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventB.java index 512b9d69ef..450205503e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventB.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventB.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventBObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventBObserver.java index 0e37fdac2c..1064003133 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventBObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/EventBObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java index 5bc9b1fe55..218144a848 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ /** * Tests adding definition errors to the event object. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java index 07579290cd..893ad354f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,7 +21,7 @@ public class ProcessObserverMethodObserver implements Extension { /** * https://issues.jboss.org/browse/CDI-88 - * + * * @param event */ public void observeObserverMethodForEventB(@Observes ProcessObserverMethod event) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventC.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventC.java index ba1e89469b..087564bff1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventC.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventC.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventCObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventCObserver.java index 8cf6c9034e..8354f637fa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventCObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/EventCObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java index c2f7a8b4fb..3f90941e30 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodExceptionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ /** * Tests event observer throwing exception causes container to produce a definition error. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodObserver.java index 5589cb2738..5b0934b8f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/broken/exception/ProcessObserverMethodObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,7 +20,7 @@ public class ProcessObserverMethodObserver implements Extension { /** * https://issues.jboss.org/browse/CDI-88 - * + * * @param event */ public void observeObserverMethodForEventC(@Observes ProcessObserverMethod event) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/priority/ExtensionObserverOrderingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/priority/ExtensionObserverOrderingTest.java index 9827d5f897..87f8e315de 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/priority/ExtensionObserverOrderingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/observer/priority/ExtensionObserverOrderingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -37,7 +37,7 @@ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) public class ExtensionObserverOrderingTest extends AbstractTest { - + private final static String[] numbers = new String[] { "1", "2", "3", "4", "5", "6", "7" }; @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cat.java index f06d7aed36..77e41941c8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/CatInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/CatInterceptorBinding.java index a18b99d38d..239d5af93c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/CatInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/CatInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,11 +17,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.interceptor.InterceptorBinding; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.interceptor.InterceptorBinding; + @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Chicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Chicken.java index 7c8bd92dda..d35e8f258e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Chicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Chicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ChickenHutch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ChickenHutch.java index 5842a9304a..c5db0fa96d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ChickenHutch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ChickenHutch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cow.java index da0f223c03..edece52b87 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cowshed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cowshed.java index bbe4abd4dd..170d90bedd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cowshed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/Cowshed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ProcessBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ProcessBeanTest.java index 8dd7fdeb12..e248c77baa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ProcessBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/processBean/ProcessBeanTest.java @@ -57,8 +57,10 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(ProcessBeanTest.class) .withClasses(Cat.class, Cow.class, Cowshed.class, Domestic.class, Chicken.class, ChickenHutch.class, - ProcessBeanObserver.class, CatInterceptor.class, CatInterceptorBinding.class, Animal.class, AnimalDecorator.class) - .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL).interceptors(CatInterceptor.class).decorators(AnimalDecorator.class)) + ProcessBeanObserver.class, CatInterceptor.class, CatInterceptorBinding.class, Animal.class, + AnimalDecorator.class) + .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL).interceptors(CatInterceptor.class) + .decorators(AnimalDecorator.class)) .withExtension(ProcessBeanObserver.class).build(); } @@ -67,7 +69,8 @@ public static WebArchive createTestArchive() { @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "ba"), @SpecAssertion(section = PROCESS_BEAN, id = "bb"), @SpecAssertion(section = PROCESS_BEAN, id = "eda"), @SpecAssertion(section = PROCESS_BEAN, id = "efa"), @SpecAssertion(section = PROCESS_BEAN, id = "fa"), @SpecAssertion(section = PROCESS_BEAN, id = "l"), - @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "h"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "i") }) + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "h"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "i") }) public void testProcessBeanEvent() { assertNotNull(ProcessBeanObserver.getCatBean()); @@ -119,7 +122,8 @@ public void testProcessProducerMethodEvent() { @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "eba"), @SpecAssertion(section = PROCESS_BEAN, id = "ebb"), @SpecAssertion(section = PROCESS_BEAN, id = "edd"), @SpecAssertion(section = PROCESS_BEAN, id = "efd"), @SpecAssertion(section = PROCESS_BEAN, id = "fd"), @SpecAssertion(section = PROCESS_BEAN, id = "n"), - @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jb"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jd") }) + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jb"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jd") }) @Test public void testProcessProducerFieldEvent() { @@ -151,13 +155,15 @@ public void testProcessProducerFieldEvent() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "aa"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "i") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "aa"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "i") }) public void testProcessBeanFiredForInterceptor() { assertNotNull(ProcessBeanObserver.getInterceptor()); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "aa"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "i") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "aa"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "i") }) public void testProcessBeanFiredForDecorator() { assertNotNull(ProcessBeanObserver.getDecorator()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Bird.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Bird.java index 04d08a4c4e..5cd7b381b8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Bird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Bird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/BirdCage.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/BirdCage.java index 71dad651e6..94b8b4d0ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/BirdCage.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/BirdCage.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CanSpeakDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CanSpeakDecorator.java index 19f1693070..b742cb505a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CanSpeakDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CanSpeakDecorator.java @@ -27,9 +27,11 @@ @Priority(Interceptor.Priority.APPLICATION + 100) public abstract class CanSpeakDecorator implements Speakable { - @Inject @Delegate Cat cat; - + @Inject + @Delegate + Cat cat; + public String saySomething() { - return cat.saySomething()+ " meow"; + return cat.saySomething() + " meow"; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cat.java index a29db2a2b1..0928f8dce6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ import jakarta.inject.Inject; -public class Cat implements Speakable{ +public class Cat implements Speakable { private static boolean constructorCalled; private static boolean initializerCalled; @@ -23,7 +23,7 @@ public class Cat implements Speakable{ protected CatFoodDish foodDish; private Bird bird; - + public Cat() { } @@ -55,7 +55,7 @@ public static void reset() { public void ping() { } - + @CatSpectator @CatHolder public int foo() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatFoodDish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatFoodDish.java index 31b51896de..e1bba7068c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatFoodDish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatFoodDish.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolder.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolder.java index 04714b91c9..7308a1f8cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolder.java @@ -27,6 +27,7 @@ * */ @InterceptorBinding -@Target({TYPE, METHOD}) +@Target({ TYPE, METHOD }) @Retention(RUNTIME) -public @interface CatHolder {} +public @interface CatHolder { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolderInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolderInterceptor.java index 0c2c2ab954..9f8e27d1a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolderInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatHolderInterceptor.java @@ -33,6 +33,6 @@ public class CatHolderInterceptor implements Serializable { @AroundInvoke public Object increaseIt(InvocationContext ctx) throws Exception { - return (Integer)ctx.proceed() + 1; + return (Integer) ctx.proceed() + 1; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatInterceptor.java index 37024659b9..925af14e4d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatInterceptor.java @@ -29,6 +29,6 @@ public class CatInterceptor { @AroundInvoke public Object increaseIt(InvocationContext ctx) throws Exception { - return (Integer)ctx.proceed() + 10; + return (Integer) ctx.proceed() + 10; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatSpectator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatSpectator.java index 0cdd3eee7c..1df4501c2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatSpectator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CatSpectator.java @@ -13,8 +13,8 @@ */ package org.jboss.cdi.tck.tests.full.extensions.producer; -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Retention; @@ -27,6 +27,7 @@ * */ @InterceptorBinding -@Target({TYPE, METHOD}) +@Target({ TYPE, METHOD }) @Retention(RUNTIME) -public @interface CatSpectator {} +public @interface CatSpectator { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CheckableInjectionTarget.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CheckableInjectionTarget.java index 3389eff863..4e7de77dc3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CheckableInjectionTarget.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CheckableInjectionTarget.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cow.java index 5e60c37800..1df2b92a0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CowProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CowProducer.java index 1fd792f011..7f6bd67caa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CowProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/CowProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Dog.java index 8ac53ce5b3..d6c1c2732e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBed.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBed.java index ddd34d1dcf..0ef903b073 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBed.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBed.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBone.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBone.java index fd61468c8a..1c748eff66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBone.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogBone.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogProducer.java index 767537d79f..24394d994b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/DogProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/LitterBox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/LitterBox.java index ccf0b9e54f..8e9a4d4d63 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/LitterBox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/LitterBox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d2bf17a5c0..02da35604a 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Preferred.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Preferred.java index 6bb16afc37..baee90f420 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Preferred.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Preferred.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerProcessor.java index f96e53e304..47f0cba620 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/ProducerProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 72cd04f3a8..8502165f7f 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 @@ -25,7 +25,6 @@ import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.InjectionTarget; import jakarta.enterprise.inject.spi.Producer; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -60,10 +59,10 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ - @SpecAssertion(section = INJECTIONTARGET, id = "ba"), - @SpecAssertion(section = INJECTIONTARGET, id = "bb"), - @SpecAssertion(section = INJECTIONTARGET, id = "bc") + @SpecAssertions({ + @SpecAssertion(section = INJECTIONTARGET, id = "ba"), + @SpecAssertion(section = INJECTIONTARGET, id = "bb"), + @SpecAssertion(section = INJECTIONTARGET, id = "bc") }) public void testProduceAndInjectCallsInitializerAndConstructor() { Cat.reset(); @@ -74,11 +73,11 @@ public void testProduceAndInjectCallsInitializerAndConstructor() { injectionTarget.inject(instance, ctx); assert Cat.isInitializerCalled(); } - + @Test @SpecAssertions({ - @SpecAssertion(section = INJECTIONTARGET, id = "bd"), - @SpecAssertion(section = INJECTIONTARGET, id = "be") + @SpecAssertion(section = INJECTIONTARGET, id = "bd"), + @SpecAssertion(section = INJECTIONTARGET, id = "be") }) public void testInterceptorAndDecoratorStackBuilt() { InjectionTarget injectionTarget = ProducerProcessor.getCatInjectionTarget(); @@ -114,7 +113,8 @@ public void testGetInjectionPointsForFields() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "db"), @SpecAssertion(section = INJECTIONTARGET, id = "dc") }) + @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "db"), + @SpecAssertion(section = INJECTIONTARGET, id = "dc") }) public void testGetInjectionPointsForConstructorAndInitializer() { InjectionTarget injectionTarget = ProducerProcessor.getCatInjectionTarget(); assert injectionTarget.getInjectionPoints().size() == 3; @@ -133,7 +133,8 @@ public void testGetInjectionPointsForConstructorAndInitializer() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "eaa"), @SpecAssertion(section = PROCESS_PRODUCER, id = "aa"), + @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "eaa"), + @SpecAssertion(section = PROCESS_PRODUCER, id = "aa"), @SpecAssertion(section = PROCESS_PRODUCER, id = "ba"), @SpecAssertion(section = PROCESS_PRODUCER, id = "ca"), @SpecAssertion(section = PROCESS_PRODUCER, id = "da"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jb") }) public void testProduceCallsProducerMethod() { @@ -146,7 +147,8 @@ public void testProduceCallsProducerMethod() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "e"), @SpecAssertion(section = PROCESS_PRODUCER, id = "ga") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "e"), + @SpecAssertion(section = PROCESS_PRODUCER, id = "ga") }) public void testSetProducerOverridesProducer() { ProducerProcessor.reset(); assert getContextualReference(Cow.class, new Noisy.Literal()) instanceof Cow; @@ -154,7 +156,8 @@ public void testSetProducerOverridesProducer() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "eba"), @SpecAssertion(section = PROCESS_PRODUCER, id = "ab"), + @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "eba"), + @SpecAssertion(section = PROCESS_PRODUCER, id = "ab"), @SpecAssertion(section = PROCESS_PRODUCER, id = "bb"), @SpecAssertion(section = PROCESS_PRODUCER, id = "cb"), @SpecAssertion(section = PROCESS_PRODUCER, id = "db"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "jb") }) public void testProduceAccessesProducerField() { @@ -189,8 +192,10 @@ public void testInjectionPointsForProducerMethod() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "i"), @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "c"), - @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "aaa"), @SpecAssertion(section = INJECTIONTARGET_EE, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "i"), + @SpecAssertion(section = TYPE_DISCOVERY_STEPS, id = "c"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "aaa"), + @SpecAssertion(section = INJECTIONTARGET_EE, id = "a") }) public void testInjectionTargetInject() { InjectionTarget injectionTarget = ProducerProcessor.getDogInjectionTarget(); Bean dogBean = (Bean) getCurrentManager().getBeans(Dog.class).iterator().next(); @@ -202,7 +207,8 @@ public void testInjectionTargetInject() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "j"), @SpecAssertion(section = INJECTIONTARGET_EE, id = "b") }) + @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 Noisy.Literal()); @@ -212,7 +218,8 @@ public void testInjectionTargetPostConstruct() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTIONTARGET, id = "k"), @SpecAssertion(section = INJECTIONTARGET_EE, id = "c") }) + @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 Noisy.Literal()); @@ -222,7 +229,8 @@ public void testInjectionTargetPreDestroy() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "bb"), @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "ea") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "bb"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "ea") }) public void testSettingInjectionTargetReplacesIt() { CheckableInjectionTarget.setInjectCalled(false); getContextualReference(BirdCage.class); 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 4322472b2d..8669e69ec7 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Tabby.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Tabby.java index ef56e5d9c6..7f125b156c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Tabby.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/Tabby.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/Dog.java index b380e9173d..9bfcd2fa25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/EventProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/EventProcessor.java index 36e47a8c4a..d64bd10a78 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/EventProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/EventProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java index 2dd8503e27..29e86d0332 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,7 @@ /** * Test for adding a definition error via the ProcessInjectionTarget event. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitDefinitionErrorExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitDefinitionErrorExtension.java index d2928dc3e4..9e4192704b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitDefinitionErrorExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitDefinitionErrorExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ import jakarta.enterprise.inject.spi.ProcessProducer; /** - * + * * @author Martin Kouba */ public class ExplicitDefinitionErrorExtension implements Extension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitExceptionExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitExceptionExtension.java index b6a2202000..e98f4b6c0c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitExceptionExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ExplicitExceptionExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ import jakarta.enterprise.inject.spi.ProcessProducer; /** - * + * * @author Martin Kouba */ public class ExplicitExceptionExtension implements Extension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/Gold.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/Gold.java index 84f32b70d5..deab94060a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/Gold.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/Gold.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.extensions.producer.broken.processing; - public class Gold { public Gold(int carats) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/GoldProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/GoldProducer.java index 06711dfa41..3041abcb1c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/GoldProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/GoldProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithDefinitionErrorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithDefinitionErrorTest.java index acc016d507..8a9351df3f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithDefinitionErrorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithDefinitionErrorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ /** * Test that {@link ProcessProducer#addDefinitionError(Throwable)} causes container to abort deployment. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithExceptionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithExceptionTest.java index c20474cc16..7de0d37afe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithExceptionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/producer/broken/processing/ProducerProcessingWithExceptionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ /** * Test that if observer method of a {@link ProcessProducer} event throws an exception it is treated as definition error. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/Chair.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/Chair.java index d89d046109..164802579b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/Chair.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/Chair.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeCandidate.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeCandidate.java index 329da399ee..602b542018 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeCandidate.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeCandidate.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeExtension.java index aa759da3ad..22f44212c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/extensions/stereotype/StereotypeExtension.java @@ -19,7 +19,6 @@ import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; import jakarta.enterprise.inject.spi.Extension; - /** * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/BuiltinMetadataBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/BuiltinMetadataBeanTest.java index 5101a6ff18..3da5883c76 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/BuiltinMetadataBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/BuiltinMetadataBeanTest.java @@ -17,12 +17,16 @@ import static org.jboss.cdi.tck.cdi.Sections.BEAN_METADATA; import static org.testng.Assert.assertEquals; +import java.lang.reflect.Type; +import java.util.Collections; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -33,9 +37,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; - /** *

    * This test was originally part of Weld test suite. @@ -44,6 +45,7 @@ * Note that we also test that all built-in beans are passivation capable dependencies - if validation of passivation capable * beans and dependencies fails test the deployment (and thus all test methods) will fail. *

    + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -55,7 +57,8 @@ public class BuiltinMetadataBeanTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(BuiltinMetadataBeanTest.class) - .withBeansXml(new BeansXml().interceptors(YoghurtInterceptor.class).decorators(MilkProductDecorator.class)).build(); + .withBeansXml(new BeansXml().interceptors(YoghurtInterceptor.class).decorators(MilkProductDecorator.class)) + .build(); } @Inject @@ -82,7 +85,8 @@ public void testProducerMethodMetadata() { Bean probioticYoghurtBean = getUniqueBean(Yoghurt.class, new Probiotic.Literal()); CreationalContext probioticCtx = getCurrentManager().createCreationalContext(probioticYoghurtBean); - Yoghurt probioticYoghurt = (Yoghurt) getCurrentManager().getReference(probioticYoghurtBean, Yoghurt.class, probioticCtx); + Yoghurt probioticYoghurt = (Yoghurt) getCurrentManager().getReference(probioticYoghurtBean, Yoghurt.class, + probioticCtx); assertEquals(probioticYoghurtBean, factory.getProbioticYoghurtBean()); } @@ -105,7 +109,7 @@ public void testInterceptorMetadata() { @SpecAssertion(section = BEAN_METADATA, id = "f") }) public void testDecoratorMetadata() { Bean bean = getUniqueBean(Yoghurt.class); - Decorator decorator = getCurrentManager().resolveDecorators(Collections.singleton(MilkProduct.class)) + Decorator decorator = getCurrentManager().resolveDecorators(Collections. singleton(MilkProduct.class)) .iterator().next(); MilkProductDecorator instance = yoghurt.getDecoratorInstance(); assertEquals(decorator, instance.getBean()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Frozen.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Frozen.java index e2cd545d48..15f33f6d78 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Frozen.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Frozen.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Fruit.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Fruit.java index 29c16942b8..820ff2c618 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Fruit.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Fruit.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProduct.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProduct.java index 18c39ded0a..f4ea63b3d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProduct.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProduct.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProductDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProductDecorator.java index cbebc209fd..777df6b2a6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProductDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/MilkProductDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Probiotic.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Probiotic.java index 891a725634..18db44e32f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Probiotic.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Probiotic.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Yoghurt.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Yoghurt.java index e9acd14fc4..0915996826 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Yoghurt.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/Yoghurt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/YoghurtInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/YoghurtInterceptor.java index 3b97e9a4fc..2f423c710a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/YoghurtInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/YoghurtInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/Bar.java index 23781d971a..e9a577cc7c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/Bar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Bar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/BuiltinDecoratorInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/BuiltinDecoratorInjectionTest.java index e62e99a65d..4ecdb57588 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/BuiltinDecoratorInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/BuiltinDecoratorInjectionTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BuiltinDecoratorInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanConstructorInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanConstructorInjectionTest.java index a8e2eb016b..87ee37a467 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanConstructorInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanConstructorInjectionTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratedBeanConstructorInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanFieldInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanFieldInjectionTest.java index 963da85e23..18b79b463e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanFieldInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanFieldInjectionTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratedBeanFieldInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanInitializerInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanInitializerInjectionTest.java index 8b63e026e4..3d31142eff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanInitializerInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/injection/decorated/DecoratedBeanInitializerInjectionTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratedBeanInitializerInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamConstructorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamConstructorTest.java index d2edb93bb3..50793e7f27 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamConstructorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamConstructorTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratorTypeParamConstructorTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamFieldTest.java index 5396566ae6..c348546512 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamFieldTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratorTypeParamFieldTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamInitializerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamInitializerTest.java index 271065eb61..0cbbc28de0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamInitializerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratorTypeParamInitializerTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratorTypeParamInitializerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamConstructorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamConstructorTest.java index 992a0dd2ac..2711f8fe24 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamConstructorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamConstructorTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratoredBeanTypeParamConstructorTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamFieldTest.java index 0deb5d11ce..3050b976f9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamFieldTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratoredBeanTypeParamFieldTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamInitializerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamInitializerTest.java index 8b23d35a86..af51968578 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamInitializerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/DecoratoredBeanTypeParamInitializerTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DecoratoredBeanTypeParamInitializerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanConstructor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanConstructor.java index d8a39b43c8..427c8344c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanConstructor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanConstructor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanField.java index 0af752e391..1862141bc2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanField.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanInitializer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanInitializer.java index 7a73e6616b..0cffa15791 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanInitializer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratedBeanInitializer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorConstructor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorConstructor.java index 1a7f0b3e2d..79421f938d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorConstructor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorConstructor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorField.java index 78efd29e72..c074bf8817 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorField.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorInitializer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorInitializer.java index d1d3b87fff..785feae058 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorInitializer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/builtin/metadata/broken/typeparam/decorator/MilkDecoratorInitializer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Bar.java index 0d986e3cdf..65d74d2747 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java index 47c569d3d7..05bf46302c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/DisposerMethodOnDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_DISPOSER_METHOD; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Foo.java index 05a41b0e19..4576b53d66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java index 281842bb52..34f67ae31e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/disposal/method/definition/broken/decorator/FooDecorator_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Bar.java index ab26cd5b0f..f0e207eb43 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Foo.java index efb9afa39a..a899eb0ed1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java index 911bb1798c..95eb0241e0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/FooDecorator_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java index 3b4d4176f1..a07a6b82f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/definition/broken/decorator/ProducerFieldOnDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Animal.java index dec683e095..dd65bcb1cb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlyAnimal.java index 920c19f92e..d795ed7b3d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlySpider.java index c9284e85c4..8751f49c2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DefangedTarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DefangedTarantula.java index de4efaf8fa..c9ffe8269a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DefangedTarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/DefangedTarantula.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; - -public class DefangedTarantula extends Tarantula { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; + +public class DefangedTarantula extends Tarantula { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java index a46e254d38..ee640844f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,9 +20,9 @@ /** * This bean contains a producer field and specializes another bean which has the same producer field. - * + * * @author David Allen - * + * */ @Specializes @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Spider.java index c6dd1e00bd..deb40364e6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Spider.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; - -public class Spider implements Animal { - - private static final long serialVersionUID = 1L; - - public void layEggs() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; + +public class Spider implements Animal { + + private static final long serialVersionUID = 1L; + + public void layEggs() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tame.java index 6999542759..d9d51b3cb7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tame.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import jakarta.inject.Qualifier; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Tame { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Tame { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tarantula.java index 670248c911..432066433a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/Tarantula.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; - -public class Tarantula extends Spider implements DeadlySpider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.field.lifecycle; + +public class Tarantula extends Spider implements DeadlySpider { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaConsumer.java index 5b99a7a248..964b6a278b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaConsumer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * This bean contains an injection point for a Tarantula that must be provided by the container via a (static) producer field. - * + * * @author David Allen - * + * */ @Dependent public class TarantulaConsumer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaProducer.java index 825d0d25da..443912a0d9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/field/lifecycle/TarantulaProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Bar.java index 15599e660c..5fef110295 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Foo.java index e35009a4dc..786356b1c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/FooDecorator_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/FooDecorator_Broken.java index 358d7a79bc..9652c5b2d6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/FooDecorator_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/FooDecorator_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java index 3d1eec2ca8..014a558eb1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/broken/decorator/ProducerMethodOnDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_METHOD; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/AndalusianChicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/AndalusianChicken.java index 2c5e4983c2..c4908053bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/AndalusianChicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/AndalusianChicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Chicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Chicken.java index 490cf112e7..3df0c57728 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Chicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Chicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Egg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Egg.java index 383c50b065..213067ca7c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Egg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/definition/Egg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 f2772dfeb2..45e4ba6ed2 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 @@ -19,7 +19,7 @@ import static org.testng.Assert.assertEquals; import jakarta.enterprise.inject.UnsatisfiedResolutionException; -import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -38,9 +38,9 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(ProducerMethodDefinitionTest.class).build(); } - @Test(expectedExceptions = UnsatisfiedResolutionException.class) - @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "da"), @SpecAssertion(section = SPECIALIZATION, id = "cb") }) + @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "da"), + @SpecAssertion(section = SPECIALIZATION, id = "cb") }) public void testNonStaticProducerMethodNotInheritedBySpecializingSubclass() { 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 2f23fbc839..c6e7f85e90 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Yummy { - class Literal extends AnnotationLiteral implements Yummy { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Animal.java index 1fd2cffd25..5a3805256c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlyAnimal.java index 9c274a48e2..24bbcd74a8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlySpider.java index 7d7613dbe3..c4087d605a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Null.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Null.java index f1aa47eada..c9ba259ddd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Null.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Null.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import jakarta.inject.Qualifier; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Null { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Null { + +} 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 843149214e..e8e7665cf5 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,13 +19,13 @@ 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; 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) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/PreferredSpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/PreferredSpiderProducer.java index df1f573993..7c129ae359 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/PreferredSpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/PreferredSpiderProducer.java @@ -1,103 +1,103 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; -import jakarta.enterprise.inject.Specializes; -import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.inject.Inject; - -@Specializes -@Dependent -public class PreferredSpiderProducer extends SpiderProducer { - @Inject - private Web web; - private static Web injectedWeb; - private static Tarantula tarantulaCreated; - private static Tarantula tarantulaDestroyed; - private static boolean destroyArgumentsSet; - - @Override - @Produces - @Pet - @Specializes - public Tarantula produceTarantula() { - Tarantula tarantula = new Tarantula("Pete"); - tarantulaCreated = tarantula; - resetTarantulaDestroyed(); - injectedWeb = web; - return tarantula; - } - - @Override - @Produces - @Null - public Spider getNullSpider() { - return null; - } - - public void destroyTarantula(@Disposes @Pet Tarantula spider, BeanManager beanManager) { - tarantulaDestroyed = spider; - injectedWeb = web; - if (beanManager != null) { - destroyArgumentsSet = true; - } - } - - public static boolean isTarantulaCreated() { - return tarantulaCreated != null; - } - - public static boolean isTarantulaDestroyed() { - return tarantulaDestroyed != null; - } - - public static Tarantula getTarantulaDestroyed() { - return tarantulaDestroyed; - } - - public static void resetTarantulaCreated() { - PreferredSpiderProducer.tarantulaCreated = null; - } - - public static void resetTarantulaDestroyed() { - PreferredSpiderProducer.tarantulaDestroyed = null; - PreferredSpiderProducer.destroyArgumentsSet = false; - } - - public static boolean isDestroyArgumentsSet() { - return destroyArgumentsSet; - } - - public static Tarantula getTarantulaCreated() { - return tarantulaCreated; - } - - public static Web getInjectedWeb() { - return injectedWeb; - } - - public static void resetInjections() { - injectedWeb = null; - } - - public static void reset() { - resetTarantulaCreated(); - resetTarantulaDestroyed(); - resetInjections(); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.Specializes; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; + +@Specializes +@Dependent +public class PreferredSpiderProducer extends SpiderProducer { + @Inject + private Web web; + private static Web injectedWeb; + private static Tarantula tarantulaCreated; + private static Tarantula tarantulaDestroyed; + private static boolean destroyArgumentsSet; + + @Override + @Produces + @Pet + @Specializes + public Tarantula produceTarantula() { + Tarantula tarantula = new Tarantula("Pete"); + tarantulaCreated = tarantula; + resetTarantulaDestroyed(); + injectedWeb = web; + return tarantula; + } + + @Override + @Produces + @Null + public Spider getNullSpider() { + return null; + } + + public void destroyTarantula(@Disposes @Pet Tarantula spider, BeanManager beanManager) { + tarantulaDestroyed = spider; + injectedWeb = web; + if (beanManager != null) { + destroyArgumentsSet = true; + } + } + + public static boolean isTarantulaCreated() { + return tarantulaCreated != null; + } + + public static boolean isTarantulaDestroyed() { + return tarantulaDestroyed != null; + } + + public static Tarantula getTarantulaDestroyed() { + return tarantulaDestroyed; + } + + public static void resetTarantulaCreated() { + PreferredSpiderProducer.tarantulaCreated = null; + } + + public static void resetTarantulaDestroyed() { + PreferredSpiderProducer.tarantulaDestroyed = null; + PreferredSpiderProducer.destroyArgumentsSet = false; + } + + public static boolean isDestroyArgumentsSet() { + return destroyArgumentsSet; + } + + public static Tarantula getTarantulaCreated() { + return tarantulaCreated; + } + + public static Web getInjectedWeb() { + return injectedWeb; + } + + public static void resetInjections() { + injectedWeb = null; + } + + public static void reset() { + resetTarantulaCreated(); + resetTarantulaDestroyed(); + resetInjections(); + } + +} 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 e83f06d795..6c1103f027 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,6 +20,7 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -42,7 +43,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "c"), @SpecAssertion(section = SPECIALIZATION, id = "cb") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "c"), + @SpecAssertion(section = SPECIALIZATION, id = "cb") }) public void testProducerMethodFromSpecializedBeanUsed() { SpiderProducer.reset(); PreferredSpiderProducer.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Spider.java index 47cc342d19..c30fe6dc42 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Spider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; - -public class Spider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; + +public class Spider implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/SpiderProducer.java index c0e4f4090d..98ad88b644 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -42,7 +42,6 @@ public static void resetTarantulaCreated() { SpiderProducer.tarantulaCreated = null; } - public static Tarantula getTarantulaCreated() { return tarantulaCreated; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Tarantula.java index bcb82353d6..0a2d734b89 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Tarantula.java @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; - -public class Tarantula extends Spider implements DeadlySpider { - private final String value; - private static int numberCreated = 0; - - public Tarantula(String value) { - this.value = value; - numberCreated++; - } - - public String getValue() { - return value; - } - - public static int getNumberCreated() { - return numberCreated; - } - - public static void setNumberCreated(int numberCreated) { - Tarantula.numberCreated = numberCreated; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.implementation.producer.method.lifecycle; + +public class Tarantula extends Spider implements DeadlySpider { + private final String value; + private static int numberCreated = 0; + + public Tarantula(String value) { + this.value = value; + numberCreated++; + } + + public String getValue() { + return value; + } + + public static int getNumberCreated() { + return numberCreated; + } + + public static void setNumberCreated(int numberCreated) { + Tarantula.numberCreated = numberCreated; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Web.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Web.java index 665c52a296..f9ad543e01 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Web.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/producer/method/lifecycle/Web.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Bream.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Bream.java index 6a6285ad52..ed5cc2edbc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Bream.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Bream.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.tests.full.implementation.simple.lifecycle; -import jakarta.enterprise.context.SessionScoped; - import java.io.Serializable; +import jakarta.enterprise.context.SessionScoped; + @SessionScoped public class Bream implements Serializable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Lion.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Lion.java index 80c61866df..51fbb1635f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Lion.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/Lion.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/MountainLion.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/MountainLion.java index 0febac7c91..a79ffc4943 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/MountainLion.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/implementation/simple/lifecycle/MountainLion.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d6357978fa..b3fb91d9e8 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 @@ -17,9 +17,11 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_CAPABLE_DEPENDENCY; import static org.jboss.cdi.tck.cdi.Sections.SPECIALIZE_MANAGED_BEAN; +import java.lang.annotation.Annotation; + import jakarta.enterprise.inject.Specializes; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -29,8 +31,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Annotation; - @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) public class SimpleBeanLifecycleTest extends AbstractTest { 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 9cc0a77a40..4729359f26 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 3dcbe7abd8..09ec03261a 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Expensive { - class Literal extends AnnotationLiteral implements Expensive { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/JewelryShop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/JewelryShop.java index 66a1299556..61b908069b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/JewelryShop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/JewelryShop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Necklace.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Necklace.java index 7a9966a4e2..e12884c215 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Necklace.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Necklace.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 bb7953197c..233c81efa2 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,7 +26,6 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Named; import org.jboss.arquillian.container.test.api.Deployment; @@ -54,8 +53,10 @@ public static WebArchive createTestArchive() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia"), @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "k"), - @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "j"), @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "c"), + @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia"), + @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "k"), + @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "j"), + @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "c"), @SpecAssertion(section = SPECIALIZE_PRODUCER_METHOD, id = "aa") }) public void testSpecializingProducerMethod() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Product.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Product.java index c26d322395..428e577cde 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Product.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Product.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Shop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Shop.java index 08b0f0c856..67305647a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Shop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/Shop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 f2ec9e5da2..273fc5f986 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Sparkly { - class Literal extends AnnotationLiteral implements Sparkly { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/producer/method/broken/indirectoverride/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Expensive.java index c0a2994f13..2e33e3dbbf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Expensive.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method.broken.indirectoverride; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Expensive { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method.broken.indirectoverride; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Expensive { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/IndirectOverrideTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/IndirectOverrideTest.java index 2e7ddb446e..6a323b2e4d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/IndirectOverrideTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/IndirectOverrideTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/MallShop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/MallShop.java index 809730dda4..68ae1ba960 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/MallShop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/MallShop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Product.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Product.java index 76e69b3f6b..b8a49f5ed1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Product.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Product.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/ShoeShop_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/ShoeShop_Broken.java index b1096d53c4..23bc0d31db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/ShoeShop_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/ShoeShop_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Shop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Shop.java index 9c2830ee04..66c379ebf1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Shop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/indirectoverride/Shop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/HighSchool_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/HighSchool_Broken.java index f02f942234..f274972719 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/HighSchool_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/HighSchool_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/Pupil.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/Pupil.java index 402bf4c3fc..71dfd9d1bb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/Pupil.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/Pupil.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/School.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/School.java index 3534648803..cd011617a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/School.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/School.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/SpecializingAndSpecializedBeanHaveNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/SpecializingAndSpecializedBeanHaveNameTest.java index 2a1d732197..e0d6872e07 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/SpecializingAndSpecializedBeanHaveNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/name/SpecializingAndSpecializedBeanHaveNameTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Expensive.java index acaca3f545..28bd5c4e2f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Expensive.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method.broken.staticmethod; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Expensive { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method.broken.staticmethod; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Expensive { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/FurnitureShop_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/FurnitureShop_Broken.java index aebcbb6229..7b46cf15b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/FurnitureShop_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/FurnitureShop_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Product.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Product.java index f4ea285449..4e7f959462 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Product.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Product.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Shop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Shop.java index 512116738b..2f39f31a8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Shop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/Shop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/SpecializesStaticMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/SpecializesStaticMethodTest.java index 0cf97c9767..e6c66e38bc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/SpecializesStaticMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/staticmethod/SpecializesStaticMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Bookshop_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Bookshop_Broken.java index 3bba149067..f52ad5cb51 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Bookshop_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Bookshop_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Expensive.java index 4dc2339a24..fe29f08e11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Expensive.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method.broken.twobeans; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Expensive { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.producer.method.broken.twobeans; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Expensive { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/PictureShop_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/PictureShop_Broken.java index 423108b30c..90d27b1231 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/PictureShop_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/PictureShop_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Product.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Product.java index be917d87c6..09f8475d77 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Product.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Product.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Shop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Shop.java index eb44e05a27..67fc3560f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Shop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/Shop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java index 79f21cc2fe..c39efe0663 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/producer/method/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/DataProviderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/DataProviderProducer.java index e35c439c3b..be7c03b242 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/DataProviderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/DataProviderProducer.java @@ -21,9 +21,8 @@ public class DataProviderProducer { @Produces @Mock - public DataProvider produceDataProvider(){ - return new DataProvider(); + public DataProvider produceDataProvider() { + return new DataProvider(); } - - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/Mock.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/Mock.java index 1faf64be83..73ee487356 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/Mock.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/Mock.java @@ -25,7 +25,7 @@ import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; -@Target({TYPE, METHOD, PARAMETER, FIELD}) +@Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RetentionPolicy.RUNTIME) @Qualifier public @interface Mock { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/SpecializingBeanQualifiersTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/SpecializingBeanQualifiersTest.java index f834c361f0..1af1fa85ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/SpecializingBeanQualifiersTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/qualifiers/SpecializingBeanQualifiersTest.java @@ -49,7 +49,8 @@ public static WebArchive createTestArchive() { @Test @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "j") public void testQuailifiersOfSpecializingdNestedClass() { - testQualifiersOfSpecializedBean(StaticNestedClassesParent.StaticSpecializationBean.class, StaticNestedClassesParent.StaticMockSpecializationBean.class); + testQualifiersOfSpecializedBean(StaticNestedClassesParent.StaticSpecializationBean.class, + StaticNestedClassesParent.StaticMockSpecializationBean.class); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Animal.java index c62a6e1d10..567f4795d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Building.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Building.java index 47959bdca7..24fa5e4ae5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Building.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Building.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Egg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Egg.java index aba337a23f..55c8130be7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Egg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Egg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Farmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Farmer.java index 947a9ad6ba..7b9c46abf8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Farmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Farmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Human.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Human.java index c2b6a38566..facd170a4f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Human.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Human.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 dd4cfb5119..3ef9880aa9 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Landowner { - class Literal extends AnnotationLiteral implements Landowner { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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 22a4caa37d..d513b06d9f 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Lazy { - class Literal extends AnnotationLiteral implements Lazy { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/LazyFarmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/LazyFarmer.java index 237b36201a..58ce9fe9d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/LazyFarmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/LazyFarmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Office.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Office.java index 251feaa31c..c101da1e16 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Office.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Office.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 933072cc72..6a77688fd1 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,6 @@ import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.UnsatisfiedResolutionException; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Named; import org.jboss.arquillian.container.test.api.Deployment; @@ -56,7 +55,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia"), @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ib") }) + @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia"), + @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ib") }) public void testIndirectSpecialization() { // LazyFarmer specializes directly Farmer and indirectly Human Set> humanBeans = getBeans(Human.class); @@ -80,7 +80,8 @@ public void testSpecializingBeanInjection(Farmer farmer) { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "j"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "j"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "aa") }) public void testSpecializingBeanHasQualifiersOfSpecializedAndSpecializingBean() { Bean lazyFarmerBean = getBeans(LazyFarmer.class, LAZY_LITERAL).iterator().next(); Set lazyFarmerBeanQualifiers = lazyFarmerBean.getQualifiers(); @@ -91,7 +92,8 @@ public void testSpecializingBeanHasQualifiersOfSpecializedAndSpecializingBean() } @Test - @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "k"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "k"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ab") }) public void testSpecializingBeanHasNameOfSpecializedBean() { String expectedName = "farmer"; Set> beans = getCurrentManager().getBeans(expectedName); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Waste.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Waste.java index eabf695d3a..a57e159d5d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Waste.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/Waste.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Employee.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Employee.java index 18828a8f93..3bcb5573cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Employee.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Employee.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java index 5c494b3b7b..7890e6599b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/InconsistentSpecializationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Maid.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Maid.java index 31329638c4..e3a9303493 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Maid.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Maid.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Manager.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Manager.java index 205287fb68..1fe42dd549 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Manager.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/inconsistent/Manager.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/FarmYard_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/FarmYard_Broken.java index 938202dce3..efa25d8ec7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/FarmYard_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/FarmYard_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java index 17bc04581b..746a181086 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/SpecializingAndSpecializedBeanHasNameTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/Yard.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/Yard.java index 562453ce8e..88c638986c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/Yard.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/names/Yard.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Animal.java index d8608e8a1a..4badc8bd99 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple.broken.noextend1; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.inheritance.specialization.simple.broken.noextend1; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java index 769775c673..1a9c1d316c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnlyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnlyTest.java index 8cc66dcc69..e11b087bfb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnlyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend1/SpecializingBeanImplementsInterfaceOnlyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java index 55a2aa3937..c19650c5ff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/Cow_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java index 43c2729643..1a470a0fd1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend2/SpecializingBeanExtendsNothingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java index 1e382004bd..8181535792 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Cow_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Mammal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Mammal.java index 9abe35692d..3a89d1155b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Mammal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/Mammal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java index 8f3945a707..b91e9b3e50 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/noextend3/SpecializingClassExtendsNonSimpleBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Bar.java index 45ef681649..dbf45451f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Baz.java index f60ccf0e80..7ebf1bdd52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Foo.java index 70c48e0342..519e601a95 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/SpecializingBeanWithoutBeanTypeOfSpecializedBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/SpecializingBeanWithoutBeanTypeOfSpecializedBeanTest.java index 62938949f5..320fcb1d73 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/SpecializingBeanWithoutBeanTypeOfSpecializedBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/inheritance/specialization/simple/broken/types/SpecializingBeanWithoutBeanTypeOfSpecializedBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,7 @@ /** * Test that if specializing bean does not have some bean type of specialized bean, the container automatically detects the * problem and treats it as a definition error. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/Dog.java index 89d65201a0..744b24c1ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/Dog.java @@ -14,7 +14,6 @@ package org.jboss.cdi.tck.tests.full.interceptors.contract.invocationContext; import jakarta.enterprise.context.Dependent; -import jakarta.interceptor.ExcludeClassInterceptors; import jakarta.interceptor.Interceptors; @Interceptors(DogInterceptor.class) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/DogInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/DogInterceptor.java index 65567c116c..3a53cccc13 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/DogInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/DogInterceptor.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.full.interceptors.contract.invocationContext; -import jakarta.interceptor.AroundInvoke; -import jakarta.interceptor.InvocationContext; - import java.lang.annotation.Annotation; import java.util.Set; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.InvocationContext; + public class DogInterceptor { private static Set allBindings; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/FishInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/FishInterceptor.java index fe6303e85c..3f8d731b4b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/FishInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/FishInterceptor.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.full.interceptors.contract.invocationContext; -import jakarta.interceptor.AroundInvoke; -import jakarta.interceptor.InvocationContext; - import java.lang.annotation.Annotation; import java.util.Set; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.InvocationContext; + public class FishInterceptor { private static Set allBindings; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithAtInterceptorsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithAtInterceptorsTest.java index 058a2e6bd1..c0198dc55e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithAtInterceptorsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithAtInterceptorsTest.java @@ -13,6 +13,12 @@ */ package org.jboss.cdi.tck.tests.full.interceptors.contract.invocationContext; +import static org.jboss.cdi.tck.TestGroups.CDI_FULL; +import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INVOCATIONCONTEXT; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -21,12 +27,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.CDI_FULL; -import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INVOCATIONCONTEXT; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "interceptors", version = "2.2") @Test(groups = CDI_FULL) public class InterceptorBindingsWithAtInterceptorsTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithInterceptorFactoryTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithInterceptorFactoryTest.java index 5a428a10a4..c87211d89c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithInterceptorFactoryTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/InterceptorBindingsWithInterceptorFactoryTest.java @@ -19,6 +19,9 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.lang.annotation.Annotation; +import java.util.Set; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -27,9 +30,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Annotation; -import java.util.Set; - @SpecVersion(spec = "interceptors", version = "2.2") @Test(groups = CDI_FULL) public class InterceptorBindingsWithInterceptorFactoryTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor1.java index 394fde3c55..f1c3661ba4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor1.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.full.interceptors.contract.invocationContext; +import java.lang.annotation.Annotation; +import java.util.Set; + import jakarta.annotation.Priority; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import java.lang.annotation.Annotation; -import java.util.Set; - @Priority(Interceptor.Priority.APPLICATION + 400) @ProductInterceptorBinding2 @Interceptor @@ -31,7 +31,7 @@ public class ProductInterceptor1 { @AroundInvoke public Object aroundInvoke(InvocationContext invocationContext) throws Exception { allBindings = invocationContext.getInterceptorBindings(); - return (1 + (Integer)invocationContext.proceed()); + return (1 + (Integer) invocationContext.proceed()); } public static Set getAllBindings() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor2.java index d06ab6b4c1..b7aaf82a3a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptor2.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.tck.tests.full.interceptors.contract.invocationContext; +import java.lang.annotation.Annotation; +import java.util.Set; + import jakarta.annotation.Priority; import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import java.lang.annotation.Annotation; -import java.util.Set; - @Priority(Interceptor.Priority.APPLICATION + 400) @ProductInterceptorBinding3 @Interceptor @@ -31,7 +31,7 @@ public class ProductInterceptor2 { @AroundInvoke public Object aroundInvoke(InvocationContext invocationContext) throws Exception { allBindings = invocationContext.getInterceptorBindings(); - return (1 + (Integer)invocationContext.proceed()); + return (1 + (Integer) invocationContext.proceed()); } public static Set getAllBindings() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding1.java index 83a35c4e03..00c3c3cbe6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding1.java @@ -17,14 +17,14 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -@Target({TYPE, METHOD}) +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; + +@Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented @InterceptorBinding diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding2.java index 70f04bcd98..b1fd9484bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding2.java @@ -17,13 +17,13 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; + @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding3.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding3.java index 4c21f816f7..ab97325e74 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding3.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/invocationContext/ProductInterceptorBinding3.java @@ -17,13 +17,13 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.interceptor.InterceptorBinding; - import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.interceptor.InterceptorBinding; + @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bar.java index d58943b4d6..ee9320f3d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bird.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bird.java index d840a190f2..4e5fb4021f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Bird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Eagle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Eagle.java index de22df36e4..bf65afc1f2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Eagle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/contract/lifecycleCallback/wrapped/Eagle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/Automobile.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/Automobile.java index 6a93c79f80..ebc084543d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/Automobile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/Automobile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java index 80f5bc2b58..94e4b8e55a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java index d4b916cf68..036141e480 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptorCanNotBeDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java index 681a6c890f..fa1e0cf79b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java index cfc75f6284..bab8b1b13e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java index e7058a52d4..dc4c88603d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java index 415add258e..9d675d172f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/Transactional.java index a9248bd0fd..11f27d0b36 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/broken/sameClassListedTwiceInBeansXml/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java index 0502c56171..83ff823ee0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/InterceptorConflictingEnablementTest.java @@ -20,6 +20,8 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import static org.testng.Assert.assertEquals; +import java.util.List; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -30,8 +32,6 @@ import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import java.util.List; - /** * This test was originally part of Weld testsuite * @@ -52,7 +52,8 @@ public static Archive createTestArchive() { } @org.testng.annotations.Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = CDI_FULL) - @SpecAssertions({ @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "k"), @SpecAssertion(section = ENABLED_DECORATORS, id = "d") }) + @SpecAssertions({ @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "k"), + @SpecAssertion(section = ENABLED_DECORATORS, id = "d") }) public void testInterception(TestBean testBean) { ActionSequence.reset(); testBean.ping(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Logged.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Logged.java index 0082ee574b..e0625523e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Logged.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Logged.java @@ -19,6 +19,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Transactional.java index a604ff0c52..4950d3f9ea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/conflictingenablement/Transactional.java @@ -19,6 +19,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.interceptor.InterceptorBinding; @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/AfterBeanDiscoveryObserver.java index 1be1c7cdd6..7f42041a8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 e629634310..7512a5908a 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,7 +24,6 @@ import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InvocationContext; public class CustomInterceptorImplementation implements Interceptor { @@ -97,7 +96,8 @@ public Class getBeanClass() { return SimpleInterceptorWithoutAnnotations.class; } - public SimpleInterceptorWithoutAnnotations create(CreationalContext creationalContext) { + public SimpleInterceptorWithoutAnnotations create( + CreationalContext creationalContext) { return new SimpleInterceptorWithoutAnnotations(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorTest.java index 579835bca8..67527705d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/CustomInterceptorTest.java @@ -44,7 +44,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "ca"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) + @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "ca"), + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) // WELD-238 public void testCustomPostConstructInterceptor() { assert !getCurrentManager().resolveInterceptors(POST_CONSTRUCT, new SecureLiteral(), new TransactionalLiteral()) @@ -54,7 +55,8 @@ public void testCustomPostConstructInterceptor() { } @Test - @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cb"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) + @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cb"), + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) // WELD-238 public void testCustomPreDestroyInterceptor() { assert !getCurrentManager().resolveInterceptors(PRE_DESTROY, new SecureLiteral(), new TransactionalLiteral()).isEmpty(); @@ -63,7 +65,8 @@ public void testCustomPreDestroyInterceptor() { } @Test - @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cc"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) + @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cc"), + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) // WELD-238 public void testCustomPostActivateInterceptor() { assert !getCurrentManager().resolveInterceptors(POST_ACTIVATE, new SecureLiteral(), new TransactionalLiteral()) @@ -73,7 +76,8 @@ public void testCustomPostActivateInterceptor() { } @Test - @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cd"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) + @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cd"), + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) // WELD-238 public void testCustomPrePassivateInterceptor() { assert !getCurrentManager().resolveInterceptors(PRE_PASSIVATE, new SecureLiteral(), new TransactionalLiteral()) @@ -83,7 +87,8 @@ public void testCustomPrePassivateInterceptor() { } @Test - @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "ce"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) + @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "ce"), + @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) // WELD-238 public void testCustomAroundInvokeInterceptor() { assert !getCurrentManager().resolveInterceptors(AROUND_INVOKE, new SecureLiteral(), new TransactionalLiteral()) @@ -93,7 +98,8 @@ public void testCustomAroundInvokeInterceptor() { } @Test - @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cf"), @SpecAssertion(section = INTERCEPTOR_RESOLUTION_EE, id = "a"), + @SpecAssertions({ @SpecAssertion(section = INTERCEPTOR_RESOLUTION, id = "cf"), + @SpecAssertion(section = INTERCEPTOR_RESOLUTION_EE, id = "a"), @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "dd") }) // WELD-238 public void testCustomAroundTimeoutInterceptor() { 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 6f1f06e618..c755fdde68 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SecureLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SecureLiteral.java index d1f2922647..f8499ade5e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SecureLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SecureLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SimpleInterceptorWithoutAnnotations.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SimpleInterceptorWithoutAnnotations.java index aa5eee1e72..f3253b3a64 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SimpleInterceptorWithoutAnnotations.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/SimpleInterceptorWithoutAnnotations.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 062ae9a0e3..1c64166771 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/TransactionalLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/TransactionalLiteral.java index f48c1987d0..290952a816 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/TransactionalLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/custom/TransactionalLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java index 72e52c5682..fc02eb985a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/FooDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java index 15fb495826..c47c0c3095 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorCalledBeforeDecorator/TransactionInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/AccountHolder.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/AccountHolder.java index fd147b30c4..9871ed88a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/AccountHolder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/AccountHolder.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/TransactionInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/TransactionInterceptor.java index f847b422a0..c40fee5f2d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/TransactionInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/TransactionInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java index a4c0c9786f..45a97b29ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorNotListedInBeansXml/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountBinding.java index ef6fa8f56e..abd34ecdcd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountBinding.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.tck.tests.full.interceptors.definition.interceptorOrder; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountTransaction.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountTransaction.java index c775aca999..f552a74643 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountTransaction.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AccountTransaction.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AnotherInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AnotherInterceptor.java index bdf04ad268..d7d3bf5fe8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AnotherInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/AnotherInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; + import org.jboss.cdi.tck.util.ActionSequence; @Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/FirstInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/FirstInterceptor.java index 95241332b6..c8cf215c1d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/FirstInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/FirstInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,11 +17,12 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; + import org.jboss.cdi.tck.util.ActionSequence; @Interceptor @Secure -@Priority(Interceptor.Priority.APPLICATION+1) +@Priority(Interceptor.Priority.APPLICATION + 1) public class FirstInterceptor { @AroundInvoke diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Foo.java index 10640153bb..545e5fccad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/InterceptorOrderTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/InterceptorOrderTest.java index 6a676bc2be..90b2759c9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/InterceptorOrderTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/InterceptorOrderTest.java @@ -13,6 +13,13 @@ */ package org.jboss.cdi.tck.tests.full.interceptors.definition.interceptorOrder; +import static org.jboss.cdi.tck.TestGroups.CDI_FULL; +import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.util.List; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -24,13 +31,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - -import static org.jboss.cdi.tck.TestGroups.CDI_FULL; -import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) public class InterceptorOrderTest extends AbstractTest { @@ -39,12 +39,14 @@ public class InterceptorOrderTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InterceptorOrderTest.class) - .withBeansXml(new BeansXml().interceptors(SecondInterceptor.class, FirstInterceptor.class, TransactionalInterceptor.class)) + .withBeansXml(new BeansXml().interceptors(SecondInterceptor.class, FirstInterceptor.class, + TransactionalInterceptor.class)) .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "b"), @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "c") }) + @SpecAssertions({ @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "b"), + @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "c") }) public void testInterceptorsCalledInOrderDefinedByBeansXml(Foo foo) { assertNotNull(foo); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/SecondInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/SecondInterceptor.java index a21667b233..c2d3482f9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/SecondInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/SecondInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; + import org.jboss.cdi.tck.util.ActionSequence; @Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Secure.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Secure.java index 562ed2b5e8..ae11a0d66e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Secure.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Secure.java @@ -6,22 +6,22 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.interceptors.definition.interceptorOrder; -import jakarta.interceptor.InterceptorBinding; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; +import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) @Retention(RUNTIME) @@ -29,4 +29,4 @@ @InterceptorBinding public @interface Secure { -} \ No newline at end of file +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transaction.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transaction.java index ea59bf311e..d61c160b7b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transaction.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transaction.java @@ -16,6 +16,7 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.InvocationContext; + import org.jboss.cdi.tck.util.ActionSequence; public class Transaction { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transactional.java index eedb6857be..efd5aec37c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/TransactionalInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/TransactionalInterceptor.java index 517bdef232..970df43524 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/TransactionalInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/interceptorOrder/TransactionalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,11 +17,12 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; + import org.jboss.cdi.tck.util.ActionSequence; @Transactional @Interceptor -@Priority(Interceptor.Priority.APPLICATION+2) +@Priority(Interceptor.Priority.APPLICATION + 2) public class TransactionalInterceptor { @AroundInvoke diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AccountTransaction.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AccountTransaction.java index 3e636e7de6..00dc5de658 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AccountTransaction.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AccountTransaction.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AnotherInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AnotherInterceptor.java index 4368300d0b..4df9457151 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AnotherInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/AnotherInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java index 80ac2e645f..21852c5de2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/LifecycleInterceptorOrderTest.java @@ -17,8 +17,11 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import static org.testng.Assert.assertEquals; +import java.util.List; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -30,8 +33,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) public class LifecycleInterceptorOrderTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transaction.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transaction.java index 6b12cc8644..4f4c9091a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transaction.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transaction.java @@ -16,8 +16,8 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; - import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.ActionSequence; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transactional.java index bf4aaed9fa..bd2d7d3790 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/TransactionalInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/TransactionalInterceptor.java index c608053c34..193abdc86b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/TransactionalInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/definition/lifecycle/order/TransactionalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Bird.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Bird.java index 74608a73f1..e65ffdbf05 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Bird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Bird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Eagle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Eagle.java index 897a7c178b..9e58cab7cb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Eagle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Eagle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Falcon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Falcon.java index 925d22ed7f..dc0cfc4c91 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Falcon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/order/overriden/lifecycleCallback/wrapped/Falcon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Dog.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Dog.java index 6917670018..4c108b0ac9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Dog.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/DogInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/DogInterceptor.java index 050c8e8eed..d2c6517a66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/DogInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/DogInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Fish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Fish.java index 61e593f064..5b8794698d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Fish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/Fish.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/FishInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/FishInterceptor.java index c8e878a3de..87cf15d43b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/FishInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/FishInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/MethodLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/MethodLevelInterceptorTest.java index 67927ef82d..62d2e23437 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/MethodLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/interceptors/tests/contract/method/MethodLevelInterceptorTest.java @@ -43,8 +43,8 @@ public static WebArchive createTestArchive() { public void testInterceptorCanBeAppliedToMoreThanOneMethod() { Fish fish = getContextualReference(Fish.class); assertEquals(fish.foo(), "Intercepted bar"); - assertEquals(fish.ping(),"Intercepted pong"); - assertEquals(fish.getName(),"Salmon"); + assertEquals(fish.ping(), "Intercepted pong"); + assertEquals(fish.getName(), "Salmon"); assertEquals(FishInterceptor.getInstanceCount(), 1); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/SimpleInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/SimpleInvokerTest.java index 8435f84c81..b99989da5f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/SimpleInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/SimpleInvokerTest.java @@ -15,11 +15,19 @@ */ package org.jboss.cdi.tck.tests.full.invokers; +import static org.jboss.cdi.tck.TestGroups.CDI_FULL; +import static org.testng.Assert.assertEquals; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.ProcessManagedBean; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -29,13 +37,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.jboss.cdi.tck.TestGroups.CDI_FULL; -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") @Test(groups = CDI_FULL) public class SimpleInvokerTest extends AbstractTest { @@ -68,7 +69,7 @@ public Invoker getInvoker(String name) { @SpecAssertion(section = Sections.METHOD_INVOKERS_FULL, id = "a") public void test(MyService service) throws Exception { Invoker hello = getCurrentManager().getExtension(TestExtension.class).getInvoker("hello"); - assertEquals(hello.invoke(service, new Object[]{1, List.of()}), "foobar1[]"); + assertEquals(hello.invoke(service, new Object[] { 1, List.of() }), "foobar1[]"); } @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/invalid/DecoratorInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/invalid/DecoratorInvokerTest.java index fb3175e6ee..e4cb0c0df2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/invalid/DecoratorInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/invokers/invalid/DecoratorInvokerTest.java @@ -15,6 +15,8 @@ */ package org.jboss.cdi.tck.tests.full.invokers.invalid; +import static org.jboss.cdi.tck.TestGroups.CDI_FULL; + import jakarta.annotation.Priority; import jakarta.decorator.Decorator; import jakarta.decorator.Delegate; @@ -23,6 +25,7 @@ import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.ProcessManagedBean; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -33,8 +36,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.CDI_FULL; - @SpecVersion(spec = "cdi", version = "4.1") @Test(groups = CDI_FULL) public class DecoratorInvokerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/AlaskaPlaice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/AlaskaPlaice.java index 656e55e829..5046d7734e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/AlaskaPlaice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/AlaskaPlaice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Animal.java index 339da0096a..3cee28ee57 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.lookup.byname; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.lookup.byname; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Cod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Cod.java index 26308395fe..42ee109914 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Cod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Cod.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Plaice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Plaice.java index 9f541e4d41..75ddbd4e79 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Plaice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Plaice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/ResolutionByNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/ResolutionByNameTest.java index 96b712197e..c32aac44a5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/ResolutionByNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/ResolutionByNameTest.java @@ -19,7 +19,10 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.util.Set; + import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -29,8 +32,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - /** * This test is same as {@link org.jboss.cdi.tck.tests.lookup.byname.ResolutionByNameTest} except that it includes * a bean with specialization @@ -46,7 +47,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = AMBIG_NAMES, id = "ca"), @SpecAssertion(section = BM_OBTAIN_BEAN_BY_NAME, id = "aa"), + @SpecAssertions({ @SpecAssertion(section = AMBIG_NAMES, id = "ca"), + @SpecAssertion(section = BM_OBTAIN_BEAN_BY_NAME, id = "aa"), @SpecAssertion(section = BM_OBTAIN_BEAN_BY_NAME, id = "b") }) public void testAmbiguousELNamesResolved() throws Exception { // Cod, Plaice and AlaskaPlaice are named "whitefish" - Cod is a not-enabled alternative, AlaskaPlaice specializes diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Salmon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Salmon.java index 70bbdd576e..d67f96647c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Salmon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Salmon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Sole.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Sole.java index 5ca64f689d..6f0823fa3e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Sole.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Sole.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Whitefish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Whitefish.java index 0e86797718..6b088d5db8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Whitefish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/byname/Whitefish.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.lookup.byname; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import jakarta.inject.Qualifier; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Whitefish { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.lookup.byname; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Whitefish { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/AfterBeanDiscoveryObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/AfterBeanDiscoveryObserver.java index aac0a09429..6533978651 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/AfterBeanDiscoveryObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/AfterBeanDiscoveryObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Bar.java index f84f23c6a3..54f403c6f0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Bar.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ public class Bar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Baz.java index de67a8fc7d..4f7948eec5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/Baz.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ public class Baz { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomBarBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomBarBean.java index b360f021c2..751d506ff6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomBarBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomBarBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomInstanceInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomInstanceInjectionPoint.java index 452700359e..20ae95629b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomInstanceInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/CustomInstanceInjectionPoint.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/ProcessInjectionPointObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/ProcessInjectionPointObserver.java index 3bb825b4ae..53c6460fb8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/ProcessInjectionPointObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/ProcessInjectionPointObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,6 @@ import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.ProcessInjectionPoint; -import org.jboss.cdi.tck.tests.full.lookup.dynamic.broken.raw.Baz; import org.jboss.cdi.tck.util.ForwardingInjectionPoint; public class ProcessInjectionPointObserver implements Extension { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceCustomBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceCustomBeanTest.java index f345253b27..a20fb226c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceCustomBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceCustomBeanTest.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) @@ -45,7 +45,8 @@ public static WebArchive createTestArchive() { .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withTestClass(RawInstanceCustomBeanTest.class) .withClasses(Bar.class, AfterBeanDiscoveryObserver.class, CustomBarBean.class, - CustomInstanceInjectionPoint.class).withExtension(AfterBeanDiscoveryObserver.class).build(); + CustomInstanceInjectionPoint.class) + .withExtension(AfterBeanDiscoveryObserver.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceProcessInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceProcessInjectionPointTest.java index 47e27e5930..d3731a5656 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceProcessInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/broken/raw/RawInstanceProcessInjectionPointTest.java @@ -33,7 +33,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AbstractContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AbstractContext.java index 46cfef4de2..eafdd60947 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AbstractContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AbstractContext.java @@ -13,16 +13,16 @@ */ package org.jboss.cdi.tck.tests.full.lookup.dynamic.destroy.normal; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - public abstract class AbstractContext implements Context { - protected static class Instance { + protected static class Instance { private final Object instance; private final CreationalContext ctx; @@ -31,18 +31,18 @@ public Instance(Object instance, CreationalContext ctx) { this.ctx = ctx; } - public Object getInstance() { - return instance; - } + public Object getInstance() { + return instance; + } - public CreationalContext getCtx() { - return ctx; - } - } + public CreationalContext getCtx() { + return ctx; + } + } - protected final Map, Instance> storage = new ConcurrentHashMap, Instance>(); + protected final Map, Instance> storage = new ConcurrentHashMap, Instance>(); - @Override + @Override public T get(Contextual contextual, CreationalContext creationalContext) { T instance = get(contextual); if (instance == null) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AlterableScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AlterableScoped.java index eab3040086..ee0c5b1e4b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AlterableScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/AlterableScoped.java @@ -18,12 +18,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.NormalScope; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.context.NormalScope; + @NormalScope(passivating = true) @Inherited @Target({ TYPE, METHOD, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/CustomAlterableContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/CustomAlterableContext.java index 4a245681b9..41ad1b60c8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/CustomAlterableContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/CustomAlterableContext.java @@ -13,18 +13,18 @@ */ package org.jboss.cdi.tck.tests.full.lookup.dynamic.destroy.normal; +import java.lang.annotation.Annotation; + import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.context.spi.Contextual; -import java.lang.annotation.Annotation; - public class CustomAlterableContext extends AbstractContext implements AlterableContext { private static boolean destroyCalled; @SuppressWarnings("unchecked") public void destroy(Contextual contextual) { - destroyCalled = true; + destroyCalled = true; Instance instance = storage.remove(contextual); if (instance != null) { @SuppressWarnings("rawtypes") @@ -41,8 +41,8 @@ public static boolean isDestroyCalled() { return destroyCalled; } - @Override - public Class getScope() { - return AlterableScoped.class; - } + @Override + public Class getScope() { + return AlterableScoped.class; + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java index 69c417fe82..d82b8e13c0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java @@ -20,9 +20,8 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.inject.Instance; -import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -47,56 +46,55 @@ @SpecVersion(spec = "cdi", version = "2.0") public class DestroyingNormalScopedInstanceTest extends AbstractTest { - private static final String[] VALUES = { "foo", "bar", "baz" }; - - @Deployment - public static WebArchive createTestArchive() { - return new WebArchiveBuilder() - .withTestClassPackage(DestroyingNormalScopedInstanceTest.class) - .withExtension(CustomScopeExtension.class) - .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)).build(); - } + private static final String[] VALUES = { "foo", "bar", "baz" }; - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = CDI_FULL) - @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) - public void testCustomScopedComponent( - Instance instance) { - testComponent(instance); - } + @Deployment + public static WebArchive createTestArchive() { + return new WebArchiveBuilder() + .withTestClassPackage(DestroyingNormalScopedInstanceTest.class) + .withExtension(CustomScopeExtension.class) + .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)).build(); + } - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, expectedExceptions = UnsupportedOperationException.class, groups = CDI_FULL) - @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "p") }) - public void testUnsupportedOperationExceptionThrownIfUnderlyingContextNotAlterable( - Instance instance, - CustomScopeExtension extension) { - NonAlterableComponent component = instance.get(); - instance.destroy(component); - fail("expected exception not thrown"); - } + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = CDI_FULL) + @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) + public void testCustomScopedComponent( + Instance instance) { + testComponent(instance); + } - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = CDI_FULL) - @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) - public void testContextDestroyCalled( - Instance instance) { - AlterableComponent component = instance.get(); - CustomAlterableContext.reset(); - instance.destroy(component); - assertTrue(CustomAlterableContext.isDestroyCalled()); - } + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, expectedExceptions = UnsupportedOperationException.class, groups = CDI_FULL) + @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "p") }) + public void testUnsupportedOperationExceptionThrownIfUnderlyingContextNotAlterable( + Instance instance, + CustomScopeExtension extension) { + NonAlterableComponent component = instance.get(); + instance.destroy(component); + fail("expected exception not thrown"); + } + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = CDI_FULL) + @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) + public void testContextDestroyCalled( + Instance instance) { + AlterableComponent component = instance.get(); + CustomAlterableContext.reset(); + instance.destroy(component); + assertTrue(CustomAlterableContext.isDestroyCalled()); + } - private void testComponent( - Instance instance) { - for (String string : VALUES) { - T reference = instance.get(); - assertNull(reference.getValue()); - reference.setValue(string); - assertEquals(reference.getValue(), string); + private void testComponent( + Instance instance) { + for (String string : VALUES) { + T reference = instance.get(); + assertNull(reference.getValue()); + reference.setValue(string); + assertEquals(reference.getValue(), string); - AbstractComponent.reset(); - instance.destroy(reference); - assertTrue(AbstractComponent.isDestroyed()); - assertNull(reference.getValue(), reference.getValue()); - } - } + AbstractComponent.reset(); + instance.destroy(reference); + assertTrue(AbstractComponent.isDestroyed()); + assertNull(reference.getValue(), reference.getValue()); + } + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableComponent.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableComponent.java index 6fcbd721dc..d79e79b01e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableComponent.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableComponent.java @@ -13,9 +13,7 @@ */ package org.jboss.cdi.tck.tests.full.lookup.dynamic.destroy.normal; - @NonAlterableScoped public class NonAlterableComponent extends AbstractComponent { - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableScoped.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableScoped.java index d3145e1858..43aecdcf78 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableScoped.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/dynamic/destroy/normal/NonAlterableScoped.java @@ -18,12 +18,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.NormalScope; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.context.NormalScope; + @NormalScope(passivating = false) @Inherited @Target({ TYPE, METHOD, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Counter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Counter.java index bb784eb77f..67cc73e4a6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Counter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Counter.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Game.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Game.java index be21fed062..7004ce51f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Game.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Game.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/ResolutionByNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/ResolutionByNameTest.java index 7021b929dd..d8d1aed412 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/ResolutionByNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/ResolutionByNameTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -49,12 +49,14 @@ public static WebArchive createTestArchive() { @SpecAssertion(section = DEPENDENT_SCOPE_EL, id = "a") public void testQualifiedNameLookup() { assertTrue(getCurrentConfiguration().getEl() - .evaluateValueExpression(getCurrentManager(), "#{(game.value == 'foo' and game.value == 'foo') ? game.value == 'foo' : false}", Boolean.class)); + .evaluateValueExpression(getCurrentManager(), + "#{(game.value == 'foo' and game.value == 'foo') ? game.value == 'foo' : false}", Boolean.class)); assertEquals(getContextualReference(Counter.class).getCount(), 1); } @Test - @SpecAssertions({ @SpecAssertion(section = CONTEXTUAL_INSTANCE, id = "a"), @SpecAssertion(section = CONTEXTUAL_INSTANCE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = CONTEXTUAL_INSTANCE, id = "a"), + @SpecAssertion(section = CONTEXTUAL_INSTANCE, id = "b") }) public void testContextCreatesNewInstanceForInjection() { Context requestContext = getCurrentManager().getContext(RequestScoped.class); Bean tunaBean = getBeans(Tuna.class).iterator().next(); @@ -73,7 +75,8 @@ public void testContextCreatesNewInstanceForInjection() { @SpecAssertion(section = EL, id = "c") public void testUnresolvedNameReturnsNull() { assertNull( - getCurrentManager().getELResolver().getValue(getCurrentConfiguration().getEl().createELContext(getCurrentManager()), null, "nonExistingTuna")); + getCurrentManager().getELResolver().getValue( + getCurrentConfiguration().getEl().createELContext(getCurrentManager()), null, "nonExistingTuna")); } @Test @@ -81,12 +84,15 @@ public void testUnresolvedNameReturnsNull() { public void testELResolverReturnsContextualInstance() { Salmon salmon = getContextualReference(Salmon.class); salmon.setAge(3); - assertEquals(getCurrentConfiguration().getEl().evaluateValueExpression(getCurrentManager(), "#{salmon.age}", Integer.class), new Integer(3)); + assertEquals( + getCurrentConfiguration().getEl().evaluateValueExpression(getCurrentManager(), "#{salmon.age}", Integer.class), + new Integer(3)); } @Test @SpecAssertions({ @SpecAssertion(section = NAMES, id = "a") }) public void testBeanNameWithSeparatedListOfELIdentifiers() { - assertNotNull(getCurrentConfiguration().getEl().evaluateValueExpression(getCurrentManager(), "#{magic.golden.fish}", GoldenFish.class)); + assertNotNull(getCurrentConfiguration().getEl().evaluateValueExpression(getCurrentManager(), "#{magic.golden.fish}", + GoldenFish.class)); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Salmon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Salmon.java index 184dd85a9f..4cf2d2f092 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Salmon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Salmon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Tuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Tuna.java index 8afd0d1965..9bb5981d3f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Tuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/Tuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/TunaFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/TunaFarm.java index afd81a3e73..9b140d02aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/TunaFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/el/TunaFarm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/AbstractBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/AbstractBean.java index b061748067..338f1089ec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/AbstractBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/AbstractBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/Foo.java index 57580ee5b5..2436951cbd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/Foo.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.full.lookup.injection.visibility; -import jakarta.enterprise.context.Dependent; - import java.io.Serializable; +import jakarta.enterprise.context.Dependent; + @Dependent public class Foo implements Serializable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/InjectionVisibilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/InjectionVisibilityTest.java index 9bfdf11ab5..f599d2db90 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/InjectionVisibilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/InjectionVisibilityTest.java @@ -52,5 +52,4 @@ public void testPackagePrivateSetMethodInjection() throws Exception { assertTrue(AbstractBean.fooSetCalled); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/SimpleSessionBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/SimpleSessionBean.java index fe1b4190f7..226f8c5c33 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/SimpleSessionBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injection/visibility/SimpleSessionBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,6 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Named; - @Named @SessionScoped public class SimpleSessionBean extends AbstractBean implements Serializable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Animal.java index 4c0cbbc572..e3a56acaff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,6 +24,6 @@ public interface Animal { public InjectionPoint getDecorator2InjectionPoint(); public InjectionPoint getDecorator3InjectionPoint(); - + public Toy getToy(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/AnimalStereotype.java index 9c901938d5..20baf1df2b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/AnimalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,12 +18,12 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + @Stereotype @Target({ TYPE, METHOD, FIELD }) @Retention(RUNTIME) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/BeanWithInjectionPointMetadata.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/BeanWithInjectionPointMetadata.java index 3c12ba9f73..f30050b17b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/BeanWithInjectionPointMetadata.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/BeanWithInjectionPointMetadata.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,9 +20,9 @@ /** * Test bean with injection point on the constructor of the bean - * + * * @author David Allen - * + * */ @Dependent public class BeanWithInjectionPointMetadata { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cat.java index 8f67a6d3d9..d8700d6e6c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cattery.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cattery.java index d19775a58a..b9960e55e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cattery.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Cattery.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/ConstructorInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/ConstructorInjectionPointBean.java index 4d0fd932e7..2a17ada964 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/ConstructorInjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/ConstructorInjectionPointBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,9 +18,9 @@ /** * Test bean to inject a bean using injection point metadata into a constructor - * + * * @author David Allen - * + * */ @Dependent public class ConstructorInjectionPointBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/FieldInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/FieldInjectionPointBean.java index fad14b1b66..b3e531bac9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/FieldInjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/FieldInjectionPointBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * Test bean to inject another bean which uses injection point metadata in a field - * + * * @author David Allen - * + * */ @RequestScoped public class FieldInjectionPointBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectableReferenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectableReferenceTest.java index 928d4ae290..5e631c39c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectableReferenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectableReferenceTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,6 +23,7 @@ import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.InjectionPoint; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -36,9 +37,9 @@ /** * InjectableReference tests for the bean manager. These tests are only here due to the fact that InjectionPoints are always * needed too. - * + * * @author David Allen - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) @@ -53,8 +54,10 @@ public static WebArchive createTestArchive() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_INJECTABLE_REFERENCE, id = "a"), @SpecAssertion(section = BM_OBTAIN_INJECTABLE_REFERENCE, id = "ab"), - @SpecAssertion(section = BM_OBTAIN_CREATIONALCONTEXT, id = "a"), @SpecAssertion(section = INJECTABLE_REFERENCE, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_INJECTABLE_REFERENCE, id = "a"), + @SpecAssertion(section = BM_OBTAIN_INJECTABLE_REFERENCE, id = "ab"), + @SpecAssertion(section = BM_OBTAIN_CREATIONALCONTEXT, id = "a"), + @SpecAssertion(section = INJECTABLE_REFERENCE, id = "a") }) public void testGetInjectableReferenceOnBeanManager() { BeanWithInjectionPointMetadata.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectionPointTest.java index 96cab641b5..a56ea17d8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/InjectionPointTest.java @@ -18,8 +18,13 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; + import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.inject.spi.InjectionPoint; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -30,10 +35,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; - @SpecVersion(spec = "cdi", version = "2.0") @Test(groups = CDI_FULL) public class InjectionPointTest extends AbstractTest { @@ -42,7 +43,8 @@ public class InjectionPointTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(InjectionPointTest.class) - .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL).decorators(AnimalDecorator1.class, AnimalDecorator2.class, AnimalDecorator3.class)) + .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL).decorators(AnimalDecorator1.class, AnimalDecorator2.class, + AnimalDecorator3.class)) .build(); } @@ -65,7 +67,7 @@ public void testIsDelegate() { assert cat.getInjectionPoint() != null; assert !cat.getInjectionPoint().isDelegate(); - List> animalDecorators = getCurrentManager().resolveDecorators(Collections.singleton(Animal.class)); + List> animalDecorators = getCurrentManager().resolveDecorators(Collections. singleton(Animal.class)); assert animalDecorators.size() == 3; for (Decorator animalDecorator : animalDecorators) { // Decorator has two injection points - metadata and delegate @@ -94,7 +96,8 @@ public void testIsDelegate() { public void testPassivationCapability() throws Exception { InjectionPoint ip1 = getContextualReference(FieldInjectionPointBean.class).getInjectedBean().getInjectedMetadata(); InjectionPoint ip2 = getContextualReference(MethodInjectionPointBean.class).getInjectedBean().getInjectedMetadata(); - InjectionPoint ip3 = getContextualReference(ConstructorInjectionPointBean.class).getInjectedBean().getInjectedMetadata(); + InjectionPoint ip3 = getContextualReference(ConstructorInjectionPointBean.class).getInjectedBean() + .getInjectedMetadata(); ip1 = (InjectionPoint) activate(passivate(ip1)); ip2 = (InjectionPoint) activate(passivate(ip2)); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/MethodInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/MethodInjectionPointBean.java index cfc399ad62..799322efca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/MethodInjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/MethodInjectionPointBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * Test bean to inject a bean using injection point metadata into a constructor - * + * * @author David Allen - * + * */ @Dependent public class MethodInjectionPointBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Toy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Toy.java index 1836c33511..21964d6633 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Toy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/Toy.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java index 20bacc9eef..a2641e11f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectableReferenceTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,9 +32,9 @@ /** * Tests a custom injection point that resolves to two different bean instances which should always result in an exception. - * + * * @author David Allen - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class AmbiguousInjectableReferenceTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java index 6ee0728ec5..aefe73d41a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AmbiguousInjectionPoint.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AnnotatedInjectionField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AnnotatedInjectionField.java index c0bda34930..870a3075a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AnnotatedInjectionField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/AnnotatedInjectionField.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/DerivedInjectedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/DerivedInjectedBean.java index 2cc3a573c1..d3d7310a75 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/DerivedInjectedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/DerivedInjectedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/InjectedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/InjectedBean.java index a2bdef67c5..c1e32258cb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/InjectedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/InjectedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/SimpleBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/SimpleBean.java index ca9b2a3bb9..339a2195e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/SimpleBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/ambiguous/SimpleBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/AnnotatedInjectionField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/AnnotatedInjectionField.java index b8f263abae..b61d74bcf6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/AnnotatedInjectionField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/AnnotatedInjectionField.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/InjectedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/InjectedBean.java index 2c35c39d06..e8c11e8dae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/InjectedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/InjectedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/SimpleBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/SimpleBean.java index 8126e931e6..3081335d0f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/SimpleBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/SimpleBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java index 185a41aa13..aaecbd6790 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectableReferenceTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,9 +32,9 @@ /** * Tests retrieving an injectable reference for a bean which cannot be resolved. - * + * * @author David Allen - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class UnsatisfiedInjectableReferenceTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.java index 9cf15f290a..b4ac244626 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/injectionpoint/broken/reference/unresolved/UnsatisfiedInjectionPoint.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Animal.java index 6301f7983b..8b38af7488 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/AnimalDecorator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/AnimalDecorator.java index 3f9e5b1501..313d9c424e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/AnimalDecorator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/AnimalDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Cat.java index 0ac840552b..eb9d1ca9e6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/DecoratorNotInjectedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/DecoratorNotInjectedTest.java index 890643f3b3..127386d948 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/DecoratorNotInjectedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/DecoratorNotInjectedTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/House.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/House.java index dc682bacb3..5af84a9747 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/House.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/lookup/typesafe/resolution/decorator/House.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/AnimalStereotype.java index 381d8031dd..e2d5475934 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/AnimalStereotype.java @@ -1,35 +1,35 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.full.vetoed; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; -import jakarta.enterprise.inject.Vetoed; - -@Vetoed -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -public @interface AnimalStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.full.vetoed; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.enterprise.inject.Vetoed; + +@Vetoed +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +public @interface AnimalStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Elephant.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Elephant.java index 63726a831b..a718920fb0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Elephant.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Elephant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Gecko.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Gecko.java index 45e20c68b7..a1ed7f3333 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Gecko.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Gecko.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ import jakarta.enterprise.inject.Vetoed; /** - * + * */ @Vetoed @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/ModifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/ModifyingExtension.java index 84396d994d..444c19e50b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/ModifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/ModifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Predator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Predator.java index de34893446..fb62b721d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Predator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/Predator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VerifyingExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VerifyingExtension.java index 65e67b2de7..85f41857b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VerifyingExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 ce07f4ef11..f060b13d3b 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 @@ -21,7 +21,6 @@ import static org.testng.Assert.assertTrue; import jakarta.enterprise.inject.Any; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -32,8 +31,6 @@ import org.jboss.cdi.tck.tests.full.vetoed.aquarium.Fishy; import org.jboss.cdi.tck.tests.full.vetoed.aquarium.Piranha; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; @@ -61,7 +58,8 @@ public static WebArchive createTestArchive() { .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withClasses(Animal.class, Elephant.class, Shark.class, Predator.class, AnimalStereotype.class, Tiger.class, ModifyingExtension.class, - VerifyingExtension.class, Shark.class).withPackage(Piranha.class.getPackage()) + VerifyingExtension.class, Shark.class) + .withPackage(Piranha.class.getPackage()) .withExtensions(ModifyingExtension.class, VerifyingExtension.class) .withLibrary(new BeansXml(BeanDiscoveryMode.ALL), false, Gecko.class, Reptile.class) .build(); @@ -72,7 +70,8 @@ public static WebArchive createTestArchive() { @Test @SpecAssertions({ @SpecAssertion(section = WHAT_CLASSES_ARE_BEANS, id = "h"), - @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ia"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ib") }) + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ia"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "ib") }) public void testClassLevelVeto() { assertFalse(verifyingExtension.getClasses().contains(Elephant.class)); assertEquals(getCurrentManager().getBeans(Elephant.class, Any.Literal.INSTANCE).size(), 0); 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 f27f087fbb..51e59cefdd 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Piranha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Piranha.java index 587a969cee..a6209909c9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Piranha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/Piranha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/package-info.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/package-info.java index f4cbe22ed6..08f09e1ae4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/package-info.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/vetoed/aquarium/package-info.java @@ -17,4 +17,3 @@ package org.jboss.cdi.tck.tests.full.vetoed.aquarium; import jakarta.enterprise.inject.Vetoed; - diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/BuiltinInterceptorInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/BuiltinInterceptorInjectionTest.java index 6047fa3c80..0d05112fab 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/BuiltinInterceptorInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/BuiltinInterceptorInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BuiltinInterceptorInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/Foo.java index c04125dc49..54302ec9b6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/Foo.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanConstructorInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanConstructorInjectionTest.java index e14045ec77..65a64320e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanConstructorInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanConstructorInjectionTest.java @@ -17,7 +17,6 @@ import static org.jboss.cdi.tck.cdi.Sections.BEAN_METADATA; import jakarta.enterprise.inject.spi.DefinitionException; -import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; @@ -30,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptedBeanConstructorInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanFieldInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanFieldInjectionTest.java index 283e0d76b9..cccdfa9199 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanFieldInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanFieldInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptedBeanFieldInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanInitializerInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanInitializerInjectionTest.java index 9e9aab086c..8663ae1994 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanInitializerInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/injection/intercepted/InterceptedBeanInitializerInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptedBeanInitializerInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamConstructorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamConstructorTest.java index 7ac34774b2..193d1a0dae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamConstructorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamConstructorTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BeanTypeParamConstructorTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamDisposerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamDisposerTest.java index 82e598f1d8..6787330a7f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamDisposerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamDisposerTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BeanTypeParamDisposerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamFieldTest.java index 6f9e3918e9..e01dfa9347 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamFieldTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BeanTypeParamFieldTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamInitializerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamInitializerTest.java index 2c1ef305f7..bb1147f770 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamInitializerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamInitializerTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BeanTypeParamInitializerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamProducerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamProducerTest.java index 28b58e9a47..01fd80e278 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamProducerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/BeanTypeParamProducerTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BeanTypeParamProducerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Cream.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Cream.java index 1c7956667d..21be7e46b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Cream.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Cream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package org.jboss.cdi.tck.tests.implementation.builtin.metadata.broken.typeparam; /** diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Milk.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Milk.java index 024c40cf9a..f5cd453324 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Milk.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/Milk.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public interface Milk { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkDisposer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkDisposer.java index e48ced2b11..d8c1d72b7c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkDisposer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkDisposer.java @@ -21,7 +21,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class MilkDisposer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkProducer.java index a5c6cf96a4..c45606854d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/MilkProducer.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class MilkProducer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtConstructor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtConstructor.java index 5ceb7675a9..45737599fa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtConstructor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtConstructor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtField.java index 148a330f64..e613c14b7b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtField.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtInitializer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtInitializer.java index 46521a7927..0aa4f6ed76 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtInitializer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/YoghurtInitializer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/Binding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/Binding.java index d45c074d71..c3cc0a29d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/Binding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/Binding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanConstructor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanConstructor.java index d598c98038..3b1d57b4ff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanConstructor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanConstructor.java @@ -26,7 +26,7 @@ /** * @author Martin Kouba - * + * */ @Binding @Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanField.java index 7c4dec3fbe..e8a01a2e95 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanField.java @@ -26,7 +26,7 @@ /** * @author Martin Kouba - * + * */ @Binding @Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanInitializer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanInitializer.java index a2677bf705..687a152bd9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanInitializer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanInitializer.java @@ -26,7 +26,7 @@ /** * @author Martin Kouba - * + * */ @Binding @Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamConstructorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamConstructorTest.java index 6207e9c6f3..f2f5dee3a9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamConstructorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamConstructorTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptedBeanTypeParamConstructorTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamFieldTest.java index 12c240fd48..e8ca946ae4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamFieldTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptedBeanTypeParamFieldTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamInitializerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamInitializerTest.java index 3b7f3597e0..a9bcfa9331 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamInitializerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptedBeanTypeParamInitializerTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptedBeanTypeParamInitializerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorConstructor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorConstructor.java index 8dc2b33414..9593b1cdc5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorConstructor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorConstructor.java @@ -24,7 +24,7 @@ /** * @author Martin Kouba - * + * */ @Binding @jakarta.interceptor.Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorField.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorField.java index 9d31a3b12b..3436af8250 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorField.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorField.java @@ -24,7 +24,7 @@ /** * @author Martin Kouba - * + * */ @Binding @jakarta.interceptor.Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorInitializer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorInitializer.java index ed7e346275..2766a0e583 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorInitializer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorInitializer.java @@ -24,7 +24,7 @@ /** * @author Martin Kouba - * + * */ @Binding @jakarta.interceptor.Interceptor diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamConstructorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamConstructorTest.java index d5db28a673..5308c293e0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamConstructorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamConstructorTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptorTypeParamConstructorTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamFieldTest.java index 8d213ea9e8..9465defcaa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamFieldTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptorTypeParamFieldTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamInitializerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamInitializerTest.java index 45e119a031..52677407d9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamInitializerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/broken/typeparam/interceptor/InterceptorTypeParamInitializerTest.java @@ -30,7 +30,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptorTypeParamInitializerTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Animal.java index 81f0144c8f..99a4c78ecc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Calisoga.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Calisoga.java index f7aed08e26..a0406cad14 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Calisoga.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Calisoga.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 0bafd84611..11fba08927 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Deadliest { - class Literal extends AnnotationLiteral implements Deadliest { - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DeadlyAnimal.java index afb47bc07c..1757051fdb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DeadlySpider.java index 3c1531a64c..cb005207cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java index 5518051fdf..d3cfd7bc79 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DefangedTarantula.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 851fb382b0..5011dde933 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,6 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -57,10 +56,13 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = METHOD_CONSTRUCTOR_PARAMETER_QUALIFIERS, id = "c"), @SpecAssertion(section = DISPOSER_METHOD, id = "b"), + @SpecAssertions({ @SpecAssertion(section = METHOD_CONSTRUCTOR_PARAMETER_QUALIFIERS, id = "c"), + @SpecAssertion(section = DISPOSER_METHOD, id = "b"), @SpecAssertion(section = DISPOSER_METHOD, id = "c"), @SpecAssertion(section = DISPOSER_METHOD, id = "e"), - @SpecAssertion(section = DISPOSER_METHOD_DISPOSED_PARAMETER, id = "ba"), @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "a"), - @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "ba"), @SpecAssertion(section = DISPOSER_METHOD_RESOLUTION, id = "aa"), + @SpecAssertion(section = DISPOSER_METHOD_DISPOSED_PARAMETER, id = "ba"), + @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "a"), + @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "ba"), + @SpecAssertion(section = DISPOSER_METHOD_RESOLUTION, id = "aa"), @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "b") }) public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception { @@ -77,7 +79,8 @@ public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception } @Test - @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD, id = "aa"), @SpecAssertion(section = DISPOSER_METHOD_DISPOSED_PARAMETER, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD, id = "aa"), + @SpecAssertion(section = DISPOSER_METHOD_DISPOSED_PARAMETER, id = "ba") }) public void testDisposalMethodOnNonBean() throws Exception { DependentInstance webSpider = newDependentInstance(WebSpider.class, DEADLIEST_LITERAL); @@ -95,7 +98,8 @@ public void testDisposalMethodOnNonBean() throws Exception { * @throws Exception */ @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "h"), @SpecAssertion(section = INJECTION_POINT_DEFAULT_QUALIFIER, id = "a"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "h"), + @SpecAssertion(section = INJECTION_POINT_DEFAULT_QUALIFIER, id = "a"), @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "e") }) public void testDisposalMethodParametersGetInjected() throws Exception { @@ -127,7 +131,8 @@ public void testDisposalMethodForMultipleProducerMethods() throws Exception { * Tests that a disposal method can be bound to a product of a producer field. CDI-145 */ @Test - @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD_RESOLUTION, id = "ab"), @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "o") }) + @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD_RESOLUTION, id = "ab"), + @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "o") }) public void testDisposalMethodCalledForProducerField() throws Exception { createAndDestroyBean(Calisoga.class, new Scary.Literal()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java index a45f7f81f5..6b963505d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/DisposalNonBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,10 +33,11 @@ public static boolean isTarantulaDestroyed() { return tarantulaDestroyed; } - /*public static void setSpiderDestroyed(boolean spiderDestroyed) { - DisposalNonBean.spiderDestroyed = spiderDestroyed; - } */ - + /* + * public static void setSpiderDestroyed(boolean spiderDestroyed) { + * DisposalNonBean.spiderDestroyed = spiderDestroyed; + * } + */ public static boolean isWebSpiderdestroyed() { return webSpiderdestroyed; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Scary.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Scary.java index a7a2059148..88be36e47c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Scary.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Scary.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Spider.java index 6ed9fc489a..2bd46c8b23 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Spider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; - -public class Spider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; + +public class Spider implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/SpiderProducer.java index 620f2e464d..40995a59be 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -39,14 +39,12 @@ public class SpiderProducer { @RequestScoped private final Calisoga tameCalisoga = new Calisoga("tame"); - @Produces @Tame public Tarantula produceTameTarantula() { return new DefangedTarantula(0); } - @Produces @Deadliest public SandSpider produceDeadliestSandSpider() { 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 ac100a11d8..2ca478ae4e 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Tame { - class Literal extends AnnotationLiteral implements Tame { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@Documented +@Qualifier +public @interface Tame { + class Literal extends AnnotationLiteral implements Tame { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tarantula.java index 5543aefd39..3f5d86685e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Tarantula.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Tarantula extends Spider implements DeadlySpider { - public int getDeathsCaused() { - return 1; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Tarantula extends Spider implements DeadlySpider { + public int getDeathsCaused() { + return 1; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Widow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Widow.java index 2b24cb56c9..cb442a04dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Widow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/Widow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java index a5628440cd..4c3ff0dfa5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/InitializerUnallowedDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java index 9d3ab16171..0407bae576 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/Spider.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed; - -public class Spider { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed; + +public class Spider { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java index d3042112c3..6be4883c17 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/initializerUnallowed/SpiderProducer_Broken.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; -import jakarta.inject.Inject; - -@Dependent -public class SpiderProducer_Broken { - - @Produces - public static Spider getSpider() { - return new Spider(); - } - - @Inject - public static void destorySpider(@Disposes Spider spider) { - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.initializerUnallowed; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + +@Dependent +public class SpiderProducer_Broken { + + @Produces + public static Spider getSpider() { + return new Spider(); + } + + @Inject + public static void destorySpider(@Disposes Spider spider) { + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java index 5c940ea6ad..52b26e504a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/DisposerMethodOnInterceptorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,8 +23,6 @@ import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java index 2ab9a57cfa..3f420bd629 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/FooProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java index 47185ffef1..22576cfa99 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/Secure.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java index c4d1e9a12d..48c820b480 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/interceptor/SimpleInterceptor_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java index edaf4b6836..8c81247dd0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,7 +38,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD_DISPOSED_PARAMETER, id = "a"), @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "bb") }) + @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD_DISPOSED_PARAMETER, id = "a"), + @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "bb") }) public void testMultipleDisposeParameters() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java index d99f971b48..c01477dde1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/Spider.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.multiParams; - -public class Spider { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.multiParams; + +public class Spider { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java index b4cc8f5281..6bc3cf344a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiParams/SpiderProducer_Broken.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.multiParams; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class SpiderProducer_Broken { - @Produces - public static Spider getSpider() { - return new Spider(); - } - - public static void destorySpider(@Disposes Spider spider, @Disposes Spider another) { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.multiParams; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class SpiderProducer_Broken { + @Produces + public static Spider getSpider() { + return new Spider(); + } + + public static void destorySpider(@Disposes Spider spider, @Disposes Spider another) { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Bus.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Bus.java index e4767d6de7..2f4357fe8b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Bus.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Bus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/BusFactory.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/BusFactory.java index 13fee1af52..f76495938f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/BusFactory.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/BusFactory.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/MultipleDisposerMethodsForProducerMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/MultipleDisposerMethodsForProducerMethodTest.java index b111461e2f..f535f8d595 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/MultipleDisposerMethodsForProducerMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/MultipleDisposerMethodsForProducerMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Vehicle.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Vehicle.java index fb649792bf..893a446751 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Vehicle.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/multiple/Vehicle.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/ObserverParameterUnallowedDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/ObserverParameterUnallowedDefinitionTest.java index a6e0eac02c..dfe17308e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/ObserverParameterUnallowedDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/ObserverParameterUnallowedDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/Spider.java index 45b3c3e498..c36e4f9b9e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/Spider.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.observes; - -public class Spider { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.observes; + +public class Spider { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/SpiderProducer_Broken.java index 152ab3145f..cf5fbabc59 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/SpiderProducer_Broken.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.observes; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class SpiderProducer_Broken { - - @Produces - public static Spider getSpider() { - return new Spider(); - } - - public static void destorySpider(@Disposes @Observes Spider spider) { - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.observes; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class SpiderProducer_Broken { + + @Produces + public static Spider getSpider() { + return new Spider(); + } + + public static void destorySpider(@Disposes @Observes Spider spider) { + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java index c65690d852..572aad7c35 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/ProducesUnallowedDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java index db9f2512f0..1508fa06bc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/Spider.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed; - -public class Spider { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed; + +public class Spider { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java index ab2f11e66e..9aab8566ab 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/producesUnallowed/SpiderProducer_Broken.java @@ -1,30 +1,30 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class SpiderProducer_Broken { - @Produces - public static Spider getSpider() { - return new Spider(); - } - - @Produces - public static void destorySpider(@Disposes Spider spider) { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.producesUnallowed; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class SpiderProducer_Broken { + @Produces + public static Spider getSpider() { + return new Spider(); + } + + @Produces + public static void destorySpider(@Disposes Spider spider) { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Cat.java index b646bce0e2..b308b488dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Cat.java @@ -1,20 +1,20 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Cat { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Cat { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Spider.java index 01923f8bee..5db77d32f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/Spider.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; - -public class Spider { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; + +public class Spider { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java index 8f8720e2d2..981d6d9f74 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class SpiderProducer_Broken { - - @Produces - public static Spider getSpider() { - return new Spider(); - } - - public static void destorySpider(@Disposes Spider spider) { - } - - public static void destorySpider2(@Disposes Cat cat) { - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.unresolvedMethod; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class SpiderProducer_Broken { + + @Produces + public static Spider getSpider() { + return new Spider(); + } + + public static void destorySpider(@Disposes Spider spider) { + } + + public static void destorySpider2(@Disposes Cat cat) { + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java index 5fd6ef8cda..03adc48fc1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/DisposerMethodParameterInjectionValidationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/DisposerMethodParameterInjectionValidationTest.java index 8861a42512..2d36137069 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/DisposerMethodParameterInjectionValidationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/DisposerMethodParameterInjectionValidationTest.java @@ -30,7 +30,7 @@ /** * Validates that injection points on disposer methods are validated. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/Producer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/Producer.java index e3911fa189..4a1261cb5d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/Producer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/ambiguous/Producer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/DisposerMethodParameterInjectionValidationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/DisposerMethodParameterInjectionValidationTest.java index 9f6d9836d4..e1f456d483 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/DisposerMethodParameterInjectionValidationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/DisposerMethodParameterInjectionValidationTest.java @@ -30,7 +30,7 @@ /** * Validates that injection points on disposer methods are validated. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/Producer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/Producer.java index d7a95316f7..20160c55ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/Producer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/validation/unsatisfied/Producer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Apple.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Apple.java index 766dd7863e..5ff3b34980 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Apple.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Apple.java @@ -1,32 +1,32 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import java.util.ArrayList; -import java.util.List; - -public class Apple { - - public static List> disposedBy = new ArrayList>(); - - private AppleTree tree; - - public Apple(AppleTree tree) { - this.tree = tree; - } - - public AppleTree getTree() { - return tree; - } -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import java.util.ArrayList; +import java.util.List; + +public class Apple { + + public static List> disposedBy = new ArrayList>(); + + private AppleTree tree; + + public Apple(AppleTree tree) { + this.tree = tree; + } + + public AppleTree getTree() { + return tree; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/AppleTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/AppleTree.java index 3de8ffa475..468be624e7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/AppleTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/AppleTree.java @@ -1,34 +1,34 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Any; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class AppleTree { - - @Produces - @Yummy - public Apple produceYummyApple() { - return new Apple(this); - } - - public void disposeApple(@Disposes @Any Apple apple) { - Apple.disposedBy.add(this.getClass()); - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class AppleTree { + + @Produces + @Yummy + public Apple produceYummyApple() { + return new Apple(this); + } + + public void disposeApple(@Disposes @Any Apple apple) { + Apple.disposedBy.add(this.getClass()); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Chef.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Chef.java index 52b781feb2..a7b6f3642c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Chef.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Chef.java @@ -1,30 +1,30 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -/** - * Test that {@link Cook#disposeMeal(Meal)} is not inherited. - */ -@Dependent -public class Chef extends Cook { - - @Produces - public Meal produceDefaultMeal() { - return new Meal(this); - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +/** + * Test that {@link Cook#disposeMeal(Meal)} is not inherited. + */ +@Dependent +public class Chef extends Cook { + + @Produces + public Meal produceDefaultMeal() { + return new Meal(this); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Cook.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Cook.java index 9ab28cf5c8..932f56edc7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Cook.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Cook.java @@ -1,34 +1,34 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Any; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class Cook { - - @Produces - @Yummy - public Meal produceYummyMeal() { - return new Meal(this); - } - - public void disposeMeal(@Disposes @Any Meal meal) { - Meal.disposedBy.add(this.getClass()); - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class Cook { + + @Produces + @Yummy + public Meal produceYummyMeal() { + return new Meal(this); + } + + public void disposeMeal(@Disposes @Any Meal meal) { + Meal.disposedBy.add(this.getClass()); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GrannySmithAppleTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GrannySmithAppleTree.java index 4552a79ec4..f9b25c934c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GrannySmithAppleTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GrannySmithAppleTree.java @@ -1,21 +1,21 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class GrannySmithAppleTree extends AppleTree { - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class GrannySmithAppleTree extends AppleTree { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GreatGrannySmithAppleTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GreatGrannySmithAppleTree.java index 60725c1a88..ef2aec85df 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GreatGrannySmithAppleTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/GreatGrannySmithAppleTree.java @@ -1,30 +1,30 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -/** - * Test that {@link AppleTree#disposeApple(Apple)} is not inherited. - */ -@Dependent -public class GreatGrannySmithAppleTree extends GrannySmithAppleTree { - - @Produces - public Apple produceDefaultApple() { - return new Apple(this); - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +/** + * Test that {@link AppleTree#disposeApple(Apple)} is not inherited. + */ +@Dependent +public class GreatGrannySmithAppleTree extends GrannySmithAppleTree { + + @Produces + public Apple produceDefaultApple() { + return new Apple(this); + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Meal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Meal.java index d78015fc56..4716ce3e35 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Meal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Meal.java @@ -1,33 +1,33 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import java.util.ArrayList; -import java.util.List; - -public class Meal { - - public static List> disposedBy = new ArrayList>(); - - private Cook cook; - - public Meal(Cook cook) { - this.cook = cook; - } - - public Cook getCook() { - return cook; - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import java.util.ArrayList; +import java.util.List; + +public class Meal { + + public static List> disposedBy = new ArrayList>(); + + private Cook cook; + + public Meal(Cook cook) { + this.cook = cook; + } + + public Cook getCook() { + return cook; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Yummy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Yummy.java index a3908613b2..0fefdda030 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Yummy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/Yummy.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Yummy { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Yummy { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/parameters/DisposedParameterPositionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/parameters/DisposedParameterPositionTest.java index e61caee18c..efdd3afa64 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/parameters/DisposedParameterPositionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/parameters/DisposedParameterPositionTest.java @@ -34,7 +34,7 @@ /** * There is no requirement for disposed parameter position in the spec. - * + * * @author Martin Kouba * @see CDITCK-271 */ @@ -50,7 +50,8 @@ public static WebArchive createTestArchive() { Thinker thinker; @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "h"), @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "i"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_DISPOSER_METHOD, id = "h"), + @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "i"), @SpecAssertion(section = DISPOSER_METHOD_DISPOSED_PARAMETER, id = "a") }) public void testDisposedParameterPosition() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Chicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Chicken.java index 68517b36c2..e5b5d5d4c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Chicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Chicken.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Chicken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Chicken { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenHutch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenHutch.java index 728aeb0616..29361c77ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenHutch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenHutch.java @@ -1,35 +1,35 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer; - -import jakarta.enterprise.context.Dependent; -import jakarta.inject.Inject; - -@Dependent -public class ChickenHutch { - - public Fox fox; - public Chicken chicken; - - @Inject - public void setFox(Fox fox) { - this.fox = fox; - } - - @Inject - public void setChicken(Chicken chicken) { - this.chicken = chicken; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer; + +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; + +@Dependent +public class ChickenHutch { + + public Fox fox; + public Chicken chicken; + + @Inject + public void setFox(Fox fox) { + this.fox = fox; + } + + @Inject + public void setChicken(Chicken chicken) { + this.chicken = chicken; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenInterface.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenInterface.java index 1eae0eea6c..fd8b71281b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenInterface.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ChickenInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Fox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Fox.java index 266fb70d0b..d369799273 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Fox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Fox.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Fox { - - public String getName() { - return "gavin"; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Fox { + + public String getName() { + return "gavin"; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/InitializerMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/InitializerMethodTest.java index a342e47302..8cac44c1e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/InitializerMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/InitializerMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,7 +38,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_INITIALIZER, id = "f"), @SpecAssertion(section = METHOD_CONSTRUCTOR_PARAMETER_QUALIFIERS, id = "b"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_INITIALIZER, id = "f"), + @SpecAssertion(section = METHOD_CONSTRUCTOR_PARAMETER_QUALIFIERS, id = "b"), @SpecAssertion(section = INITIALIZER_METHODS, id = "a") }) public void testBindingTypeOnInitializerParameter() { PremiumChickenHutch hutch = getContextualReference(PremiumChickenHutch.class); @@ -48,8 +49,10 @@ public void testBindingTypeOnInitializerParameter() { } @Test - @SpecAssertions({ @SpecAssertion(section = INITIALIZER_METHODS, id = "g"), @SpecAssertion(section = DECLARING_INITIALIZER, id = "a"), - @SpecAssertion(section = DECLARING_INITIALIZER, id = "e"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS, id = "ad"), + @SpecAssertions({ @SpecAssertion(section = INITIALIZER_METHODS, id = "g"), + @SpecAssertion(section = DECLARING_INITIALIZER, id = "a"), + @SpecAssertion(section = DECLARING_INITIALIZER, id = "e"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS, id = "ad"), @SpecAssertion(section = INJECTION_POINT_DEFAULT_QUALIFIER, id = "a") }) public void testMultipleInitializerMethodsAreCalled() { ChickenHutch chickenHutch = getContextualReference(ChickenHutch.class); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Preferred.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Preferred.java index e406d18a20..1791faeb02 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Preferred.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/Preferred.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PreferredChicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PreferredChicken.java index bf16d6a391..858a14649a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PreferredChicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PreferredChicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PremiumChickenHutch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PremiumChickenHutch.java index c7bf92f9a9..010bfa82b1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PremiumChickenHutch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/PremiumChickenHutch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChicken.java index 2389ac38b8..4184e63ca8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChickenHutch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChickenHutch.java index 66804f3e69..17c4d9f801 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChickenHutch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardChickenHutch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardVariety.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardVariety.java index 49f4b099a7..c5cc9c832e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardVariety.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/StandardVariety.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Bar.java index 7d3fb27813..d19075c52e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Foo.java index 098f3cf6bb..e6e1bbaf52 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java index 18804c9993..a80f5b5b3d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/generic/GenericInitializerMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java index d9fc5936d0..9c43f21dca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/InitializerMethodAnnotatedProducesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,7 +38,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_INITIALIZER, id = "ba"), @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "ca") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_INITIALIZER, id = "ba"), + @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "ca") }) public void testInitializerMethodAnnotatedProduces() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java index f716243e97..7e38384c43 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer.broken.methodAnnotatedProduces; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; -import jakarta.inject.Inject; - -@Dependent -public class Pheasant_Broken { - - @Inject - @Produces - public void setName(String name) { - // No-op - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer.broken.methodAnnotatedProduces; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; + +@Dependent +public class Pheasant_Broken { + + @Inject + @Produces + public void setName(String name) { + // No-op + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedAsyncObserves/ParameterAnnotatedAsyncObservesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedAsyncObserves/ParameterAnnotatedAsyncObservesTest.java index 6f815bdd37..aee11886f1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedAsyncObserves/ParameterAnnotatedAsyncObservesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedAsyncObserves/ParameterAnnotatedAsyncObservesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java index 86ebdc196a..5dc51dace2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/Capercaillie_Broken.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Disposes; -import jakarta.inject.Inject; - -@Dependent -public class Capercaillie_Broken { - - @Inject - public void setName(String name, @Disposes ChickenHutch chickenHutch) { - // No-op - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Disposes; +import jakarta.inject.Inject; + +@Dependent +public class Capercaillie_Broken { + + @Inject + public void setName(String name, @Disposes ChickenHutch chickenHutch) { + // No-op + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java index 3ab39ff2e2..f5d4d8e464 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ChickenHutch.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class ChickenHutch { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedDisposes; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class ChickenHutch { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java index 3b4c0ad053..34cbe6f75e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java index f9cf6cc569..20d394f3a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/DangerCall.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves; - -public class DangerCall { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves; + +public class DangerCall { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java index 4b88afed10..a3c0931d92 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/Grouse_Broken.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.event.Observes; -import jakarta.inject.Inject; - -@Dependent -public class Grouse_Broken { - - @Inject - public void setName(String name, @Observes DangerCall dangerCall) { - // No-op - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.initializer.broken.parameterAnnotatedObserves; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; + +@Dependent +public class Grouse_Broken { + + @Inject + public void setName(String name, @Observes DangerCall dangerCall) { + // No-op + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java index 902d361e61..aab3a43fb9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Animal.java index 19d41a1831..2113934f18 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +public interface Animal { + +} 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 18625d94e7..595ff9f89c 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface AsAnimal { - class Literal extends AnnotationLiteral implements AsAnimal { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/BlackWidow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/BlackWidow.java index ca9d14340a..c96a3dea96 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/BlackWidow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/BlackWidow.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -public class BlackWidow extends Spider implements DeadlySpider { - public void bite() { - // Test method used for proxy instances to force - // creation of the instance. - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +public class BlackWidow extends Spider implements DeadlySpider { + public void bite() { + // Test method used for proxy instances to force + // creation of the instance. + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java index 6cca14f343..a6d30655c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/BlackWidowProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Chicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Chicken.java index 5332fee642..ab2e3fd798 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Chicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Chicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java index 82e90c4b67..1ef09d56c3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DaddyLongLegs.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -public class DaddyLongLegs extends Spider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +public class DaddyLongLegs extends Spider { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java index c1ffec5e71..7c0330c71c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlySpider.java index d470dad157..59bd5b7ada 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DefangedTarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DefangedTarantula.java index cca1629d59..cd15c88f05 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DefangedTarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/DefangedTarantula.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class DefangedTarantula extends Tarantula { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class DefangedTarantula extends Tarantula { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Egg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Egg.java index c16e082ac8..fe3bb0dec6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Egg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Egg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 a37949b8f3..ef38ef8b15 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Foo { - class Literal extends AnnotationLiteral implements Foo { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/FunnelWeaver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaver.java index fdab592f6c..22aea389e3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java index 63e4cdd8ce..b5bdc75bc5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java index 30252aba1e..25f14cc8e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/InfertileChicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/InfertileChicken.java index 3d6cb0217f..4bde511556 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/InfertileChicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/InfertileChicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LadybirdSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LadybirdSpider.java index 1ce4cdcdd7..1e12f52769 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LadybirdSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LadybirdSpider.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import jakarta.enterprise.context.ApplicationScoped; - -@ApplicationScoped -public class LadybirdSpider extends Spider { - - public void spinWeb() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import jakarta.enterprise.context.ApplicationScoped; + +@ApplicationScoped +public class LadybirdSpider extends Spider { + + public void spinWeb() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java index dc8ca52119..f91a3fdf88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/LameInfertileChicken.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class LameInfertileChicken extends InfertileChicken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class LameInfertileChicken extends InfertileChicken { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java index dc3449d5df..14e0d836c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/OtherSpiderProducer.java @@ -1,41 +1,41 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; -import jakarta.inject.Named; - -@Dependent -public class OtherSpiderProducer { - - public static final BlackWidow BLACK_WIDOW = new BlackWidow(); - public static final WolfSpider WOLF_SPIDER = new WolfSpider(); - - @Produces - @Pet - public WolfSpider produceWolfSpider = WOLF_SPIDER; - - @Produces - @Tame - private BlackWidow produceBlackWidow = BLACK_WIDOW; - - private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; - @Produces - public Spider[] getSpiders = ALL_SPIDERS; - - @Produces - @Named("SpiderSize") - public int getWolfSpiderSize = 4; -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Named; + +@Dependent +public class OtherSpiderProducer { + + public static final BlackWidow BLACK_WIDOW = new BlackWidow(); + public static final WolfSpider WOLF_SPIDER = new WolfSpider(); + + @Produces + @Pet + public WolfSpider produceWolfSpider = WOLF_SPIDER; + + @Produces + @Tame + private BlackWidow produceBlackWidow = BLACK_WIDOW; + + private static Spider[] ALL_SPIDERS = { new Tarantula(), new LadybirdSpider(), new DaddyLongLegs() }; + @Produces + public Spider[] getSpiders = ALL_SPIDERS; + + @Produces + @Named("SpiderSize") + public int getWolfSpiderSize = 4; +} 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 911101e15a..f510463a8e 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 2227d3963a..12cdb44f68 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 @@ -39,7 +39,6 @@ import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.literal.NamedLiteral; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.TypeLiteral; import org.jboss.arquillian.container.test.api.Deployment; @@ -74,7 +73,7 @@ public void testParameterizedReturnType() throws Exception { assert spiderConsumer.getInjectedSpider().equals(FunnelWeaverSpiderProducer.getSpider()); } - @Test + @Test @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "j"), @SpecAssertion(section = PRODUCER_FIELD, id = "c"), @SpecAssertion(section = DECLARING_PRODUCER_FIELD, id = "a") }) public void testBeanDeclaresMultipleProducerFields() { @@ -107,7 +106,7 @@ public void testApiTypeForClassReturn() { assert tarantulaBean.getTypes().contains(Object.class); } - @Test + @Test @SpecAssertion(section = PRODUCER_FIELD_TYPES, id = "a") public void testApiTypeForInterfaceReturn() { Set> animalBeans = getBeans(Animal.class, new AsAnimal.Literal()); @@ -118,7 +117,7 @@ public void testApiTypeForInterfaceReturn() { assert animalModel.getTypes().contains(Object.class); } - @Test + @Test @SpecAssertion(section = PRODUCER_FIELD_TYPES, id = "ba") public void testApiTypeForPrimitiveReturn() { Set> beans = getCurrentManager().getBeans("SpiderSize"); @@ -129,8 +128,9 @@ public void testApiTypeForPrimitiveReturn() { assert intModel.getTypes().contains(Object.class); } - @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD_TYPES, id = "bb"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "i") }) + @Test + @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD_TYPES, id = "bb"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "i") }) public void testApiTypeForArrayTypeReturn() { Set> spidersBeans = getBeans(Spider[].class); assert spidersBeans.size() == 1; @@ -141,7 +141,8 @@ public void testApiTypeForArrayTypeReturn() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_FIELD, id = "f"), @SpecAssertion(section = DECLARING_BEAN_QUALIFIERS, id = "c") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_FIELD, id = "f"), + @SpecAssertion(section = DECLARING_BEAN_QUALIFIERS, id = "c") }) public void testBindingType() { Set> tarantulaBeans = getBeans(Tarantula.class, TAME_LITERAL); assert tarantulaBeans.size() == 1; @@ -160,7 +161,8 @@ public void testScopeType() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_FIELD, id = "c"), @SpecAssertion(section = DECLARING_BEAN_NAME, id = "c") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_FIELD, id = "c"), + @SpecAssertion(section = DECLARING_BEAN_NAME, id = "c") }) public void testNamedField() { Set> beans = getCurrentManager().getBeans("blackWidow"); assert beans.size() == 1; @@ -170,7 +172,7 @@ public void testNamedField() { assert blackWidowModel.getName().equals("blackWidow"); } - @Test + @Test @SpecAssertions({ @SpecAssertion(section = DEFAULT_NAME, id = "c"), @SpecAssertion(section = NAMED_STEREOTYPE, id = "aa"), @SpecAssertion(section = NAMED_STEREOTYPE, id = "ab"), @SpecAssertion(section = BEANS_WITH_NO_NAME, id = "a"), @SpecAssertion(section = PRODUCER_FIELD_NAME, id = "a") }) @@ -182,7 +184,7 @@ public void testDefaultNamedByStereotype() { } - @Test + @Test @SpecAssertions({ @SpecAssertion(section = DEFAULT_NAME, id = "fc") }) public void testDefaultNamed() { Bean tarantulaBean = getUniqueBean(Tarantula.class, PET_LITERAL); @@ -194,7 +196,8 @@ public void testDefaultNamed() { // review 2.2 @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "c"), @SpecAssertion(section = DECLARING_PRODUCER_FIELD, id = "e") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "c"), + @SpecAssertion(section = DECLARING_PRODUCER_FIELD, id = "e") }) public void testStereotype() { Set> tarantulaBeans = getBeans(Tarantula.class, STATIC_LITERAL); assert !tarantulaBeans.isEmpty(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spider.java index 593868d041..02427c323c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spider.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -public class Spider implements Animal { - - private static final long serialVersionUID = 1L; - - public void layEggs() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +public class Spider implements Animal { + + private static final long serialVersionUID = 1L; + + public void layEggs() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java index 9da69be0ea..4214157dbd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderAsAnimalProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderListProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderListProducer.java index 76bce06cd5..8e22c64b6b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderListProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderListProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderStereotype.java index 207804c748..5cb51b0808 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/SpiderStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,9 +28,9 @@ /** * Test stereotype used to change the scope type and deployment type of another bean, in particular a producer field bean. - * + * * @author David Allen - * + * */ @Stereotype @Target({ TYPE, METHOD, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spidery.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spidery.java index f5a31ae4ae..32da7291dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spidery.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Spidery.java @@ -1,35 +1,35 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Spidery { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Spidery { + } \ No newline at end of file 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 34e09930a2..6976f7407c 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Static { - class Literal extends AnnotationLiteral implements Static { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/StaticTarantulaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java index 7a87f8f3b1..d7dc8103d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/StaticTarantulaProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 ca46c09024..9ea3fc6d20 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Tame { - class Literal extends AnnotationLiteral implements Tame { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/TameTarantulaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java index 8cb9419291..d10997e37b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/TameTarantulaProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tarantula.java index b4f4f48acd..c48d57fdd4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/Tarantula.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Tarantula extends Spider implements DeadlySpider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Tarantula extends Spider implements DeadlySpider { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/TarantulaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/TarantulaProducer.java index df2410d2c0..4f681fdea3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/TarantulaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/TarantulaProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/WolfSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/WolfSpider.java index 468ddfd23a..f623bf5e0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/WolfSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/WolfSpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition; - -public class WolfSpider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition; + +public class WolfSpider implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayTypeVariableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayTypeVariableTest.java index ea516d2cfc..f7f248305a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayTypeVariableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayTypeVariableTest.java @@ -38,15 +38,16 @@ public class ProducerFieldArrayTypeVariableTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ProducerFieldArrayTypeVariableTest.class).withClasses(TypeVariableBrokenProducer.class).build(); + return new WebArchiveBuilder().withTestClass(ProducerFieldArrayTypeVariableTest.class) + .withClasses(TypeVariableBrokenProducer.class).build(); } @Test @SpecAssertions({ - @SpecAssertion(section = PRODUCER_FIELD, id = "hb"), - @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lc") + @SpecAssertion(section = PRODUCER_FIELD, id = "hb"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lc") }) - + public void testBeanTypes() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayWildcardTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayWildcardTest.java index f195b8adf7..2f400c233d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayWildcardTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/array/ProducerFieldArrayWildcardTest.java @@ -44,8 +44,8 @@ public static WebArchive createTestArchive() { @Test @SpecAssertions({ - @SpecAssertion(section = PRODUCER_FIELD, id = "gc"), - @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "ld") + @SpecAssertion(section = PRODUCER_FIELD, id = "gc"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "ld") }) public void testBeanTypes() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java index 3a700de237..683a9fae1b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/FooProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java index 96fc7fefaa..fc4789c6f9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/inject/InjectAnnotatedProducerFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java index 1cd2abee7c..755c572323 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/ProducerFieldOnInterceptorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_FIELD; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java index bf883c53c2..48f70c9fbd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/Secure.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java index 1c28308968..2858e10d45 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/interceptor/SimpleInterceptor_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/Foo.java index 4e023ff8b4..255306c690 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/ProducerFieldWithTypeVariableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/ProducerFieldWithTypeVariableTest.java index bf2ef8b29c..0badd97174 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/ProducerFieldWithTypeVariableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable/ProducerFieldWithTypeVariableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/Foo.java index 0660770162..3bc29c4700 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/RequestScopedProducerFieldWithTypeVariableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/RequestScopedProducerFieldWithTypeVariableTest.java index 4617008e26..07b7018716 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/RequestScopedProducerFieldWithTypeVariableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/typeVariable2/RequestScopedProducerFieldWithTypeVariableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/FunnelWeaver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/FunnelWeaver.java index d5495e6935..ae3011c0f2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/FunnelWeaver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/FunnelWeaver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/ProducerFieldTypeWithWildcardTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/ProducerFieldTypeWithWildcardTest.java index 2795a59096..453395eb65 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/ProducerFieldTypeWithWildcardTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/ProducerFieldTypeWithWildcardTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/SpiderProducerWildCardType_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/SpiderProducerWildCardType_Broken.java index 8bf5cb66de..42127425f0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/SpiderProducerWildCardType_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/wildcard/SpiderProducerWildCardType_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Animal.java index 86e99b0ac3..510ced2094 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidow.java index a6c52b45d0..2267bce889 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidow.java @@ -1,35 +1,35 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -public class BlackWidow extends Spider implements DeadlySpider { - - private long timeOfBirth = 0l; - - public BlackWidow() { - } - - public BlackWidow(long timeOfBirth) { - this.timeOfBirth = timeOfBirth; - } - - public long getTimeOfBirth() { - return timeOfBirth; - } - - public void bite() { - // Test method used for proxy instances to force - // creation of the instance. - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +public class BlackWidow extends Spider implements DeadlySpider { + + private long timeOfBirth = 0l; + + public BlackWidow() { + } + + public BlackWidow(long timeOfBirth) { + this.timeOfBirth = timeOfBirth; + } + + public long getTimeOfBirth() { + return timeOfBirth; + } + + public void bite() { + // Test method used for proxy instances to force + // creation of the instance. + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java index 8eeeb86f7f..6dbe989d1c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowConsumer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * This simple bean contains an injection point to receive the value of a producer field in another bean. - * + * * @author David Allen - * + * */ @Dependent public class BlackWidowConsumer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java index 5626431c4b..eef89e414f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BlackWidowProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 66f08ca16f..bab4d9cc41 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Broken { - class Literal extends AnnotationLiteral implements Broken { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/BrownRecluse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BrownRecluse.java index 803e03b771..02a2807462 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BrownRecluse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BrownRecluse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java index fb5e7eb1fa..2d187e8a77 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/BrownRecluseProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlyAnimal.java index 619ec5e446..f27838897f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlySpider.java index 258d34d5f1..8df9505dbc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +public interface DeadlySpider extends DeadlyAnimal { + +} 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 4d5334c4b9..3c2e3b04e3 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Null { - class Literal extends AnnotationLiteral implements Null { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/NullSpiderConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumer.java index a701344f24..7df81a079c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,15 +14,15 @@ package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; -import jakarta.enterprise.context.Dependent; - import java.io.Serializable; +import jakarta.enterprise.context.Dependent; + /** * Simple bean that has an injection point for a spider - * + * * @author David Allen - * + * */ @Dependent public class NullSpiderConsumer implements Serializable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java index cd2986d1b4..9f5d943dc4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,9 +21,9 @@ /** * Simple bean that has an injection point for a spider - * + * * @author David Allen - * + * */ @Dependent public class NullSpiderConsumerForBrokenProducer implements Serializable { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java index 461294c85d..738c03eb35 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * Contains producer for Spider which always is a null value and in Dependent scope - * + * * @author David Allen - * + * */ @Dependent public class NullSpiderProducer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java index 79e2cc82b8..ec08a92b5a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,9 +20,9 @@ /** * Bean with a producer field that always returns null and is not in Dependent context (the produced result) - * + * * @author David Allen - * + * */ @Dependent public class NullSpiderProducer_Broken { 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 ab9facf88b..044d1b28fd 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -49,27 +49,30 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "a")}) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "a") }) public void testProducerFieldNotAnotherBean() { assert getContextualReference(BrownRecluse.class) != null; } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELDS_ACCESS, id = "a"), @SpecAssertion(section = PRODUCER_FIELD, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELDS_ACCESS, id = "a"), + @SpecAssertion(section = PRODUCER_FIELD, id = "b") }) public void testProducerStaticFieldBean() { StaticTarantulaConsumer tarantulaConsumer = getContextualReference(StaticTarantulaConsumer.class); assert tarantulaConsumer.getConsumedTarantula().equals(StaticTarantulaProducer.produceTarantula); } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELDS_ACCESS, id = "b"), @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "ga") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELDS_ACCESS, id = "b"), + @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "ga") }) public void testProducerFieldBeanCreate() throws Exception { BlackWidowConsumer spiderConsumer = getContextualReference(BlackWidowConsumer.class); assert spiderConsumer.getInjectedSpider().equals(BlackWidowProducer.blackWidow); } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "d"), @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "m") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "d"), + @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "m") }) public void testProducerFieldReturnsNullIsDependent() throws Exception { NullSpiderConsumer consumerBean = getContextualReference(NullSpiderConsumer.class); assert consumerBean.getInjectedSpider() == null; @@ -87,7 +90,8 @@ public void testProducerFieldForNullValueNotDependent() throws Exception { } @Test(expectedExceptions = IllegalProductException.class) - @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "e"), @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "n") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "e"), + @SpecAssertion(section = PRODUCER_FIELD_LIFECYCLE, id = "n") }) public void testProducerFieldReturnsNullIsNotDependent() throws Exception { NullSpiderConsumerForBrokenProducer consumer = getContextualReference(NullSpiderConsumerForBrokenProducer.class); // The injected spider is proxied since it is in the request scope. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Spider.java index 603f60bb8b..ac29b4f7ea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Spider.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -public class Spider implements Animal { - - private static final long serialVersionUID = 1L; - - public void layEggs() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +public class Spider implements Animal { + + private static final long serialVersionUID = 1L; + + public void layEggs() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java index 685ad243a0..0bb6f6af8e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/SpiderStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,9 +28,9 @@ /** * Test stereotype used to change the scope type and deployment type of another bean, in particular a producer field bean. - * + * * @author David Allen - * + * */ @Stereotype @Target({ TYPE, METHOD, FIELD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Static.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Static.java index bab59cf684..6e11f03298 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Static.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Static.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Static { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Static { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java index 4646fe8a90..fee2f7f123 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaConsumer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * This bean contains an injection point for a Tarantula that must be provided by the container via a (static) producer field. - * + * * @author David Allen - * + * */ @Dependent public class StaticTarantulaConsumer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java index 8b9f0be3ef..68ad192809 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/StaticTarantulaProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 b160ed221c..8ff2a174ba 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Tame { - class Literal extends AnnotationLiteral implements Tame { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Tarantula.java index f4f1bf0caf..0f849a07e3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Tarantula.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -public class Tarantula extends Spider implements DeadlySpider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +public class Tarantula extends Spider implements DeadlySpider { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Working.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Working.java index 94c56090dd..36387672eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Working.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/lifecycle/Working.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Working { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Working { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayTypeVariableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayTypeVariableTest.java index 19afbec300..d29fca7f2f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayTypeVariableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayTypeVariableTest.java @@ -38,13 +38,14 @@ public class ProducerMethodArrayTypeVariableTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ProducerMethodArrayTypeVariableTest.class).withClasses(TypeVariableBrokenProducer.class).build(); + return new WebArchiveBuilder().withTestClass(ProducerMethodArrayTypeVariableTest.class) + .withClasses(TypeVariableBrokenProducer.class).build(); } @Test @SpecAssertions({ - @SpecAssertion(section = PRODUCER_METHOD, id = "ic"), - @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lc") + @SpecAssertion(section = PRODUCER_METHOD, id = "ic"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lc") }) public void testBeanTypes() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayWildcardTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayWildcardTest.java index 761f68e019..5068641121 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayWildcardTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/array/ProducerMethodArrayWildcardTest.java @@ -44,8 +44,8 @@ public static WebArchive createTestArchive() { @Test @SpecAssertions({ - @SpecAssertion(section = PRODUCER_METHOD, id = "hb"), - @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "ld") + @SpecAssertion(section = PRODUCER_METHOD, id = "hb"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "ld") }) public void testBeanTypes() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java index faa019c589..f73417925b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/ProducerMethodOnInterceptorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_METHOD; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/Secure.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/Secure.java index 4e2bf9d9bc..b28a37e1a5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/Secure.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/Secure.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java index e126025457..9032f75d4f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/interceptor/SimpleInterceptor_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java index 84e0bcf397..932e30286d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/ParameterAnnotatedDisposesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderProducer_Broken.java index 697c59d395..555933d68d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderProducer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java index 639f028e33..fef0aef552 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/ParameterAnnotatedObservesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/SpiderProducer_Broken.java index df2e90e92b..248e60f44d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObserves/SpiderProducer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObservesAsync/ParameterAnnotatedAsyncObservesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObservesAsync/ParameterAnnotatedAsyncObservesTest.java index cc592f8146..d52e127036 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObservesAsync/ParameterAnnotatedAsyncObservesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterAnnotatedObservesAsync/ParameterAnnotatedAsyncObservesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/GeneralListProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/GeneralListProducer.java index 2eab188398..ff2c9b1eaf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/GeneralListProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/GeneralListProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedReturnTypeWithTypeVariableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedReturnTypeWithTypeVariableTest.java index 59cb443941..f2c2712cd4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedReturnTypeWithTypeVariableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParameterizedReturnTypeWithTypeVariableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -32,7 +32,8 @@ public class ParameterizedReturnTypeWithTypeVariableTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ParameterizedReturnTypeWithTypeVariableTest.class).withClasses(GeneralListProducer.class).build(); + return new WebArchiveBuilder().withTestClass(ParameterizedReturnTypeWithTypeVariableTest.class) + .withClasses(GeneralListProducer.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParametrizedReturnTypeWithTypeVariable02Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParametrizedReturnTypeWithTypeVariable02Test.java index 5a2c6059f0..dd3227cfde 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParametrizedReturnTypeWithTypeVariable02Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithTypeParameter/ParametrizedReturnTypeWithTypeVariable02Test.java @@ -30,7 +30,8 @@ public class ParametrizedReturnTypeWithTypeVariable02Test extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ParametrizedReturnTypeWithTypeVariable02Test.class).withClasses(DoubleListProducer.class).build(); + return new WebArchiveBuilder().withTestClass(ParametrizedReturnTypeWithTypeVariable02Test.class) + .withClasses(DoubleListProducer.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/FunnelWeaver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/FunnelWeaver.java index 8bfd17882e..3e67a6e6ff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/FunnelWeaver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/FunnelWeaver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java index ecfe80a6cb..1e117b2f25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParameterizedTypeWithWildcardTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,11 +34,13 @@ public class ParameterizedTypeWithWildcardTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ParameterizedTypeWithWildcardTest.class).withClasses(FunnelWeaver.class, SpiderProducer.class).build(); + return new WebArchiveBuilder().withTestClass(ParameterizedTypeWithWildcardTest.class) + .withClasses(FunnelWeaver.class, SpiderProducer.class).build(); } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "ha"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lb") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "ha"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lb") }) public void testParameterizedReturnTypeWithWildcard() throws Exception { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParametrizedTypeWithWildcard02Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParametrizedTypeWithWildcard02Test.java index 6daf3eae13..a072922819 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParametrizedTypeWithWildcard02Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/ParametrizedTypeWithWildcard02Test.java @@ -39,9 +39,9 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "ha"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lb") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "ha"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "lb") }) public void testParameterizedReturnTypeWithDoubleWildcard() throws Exception { } } - diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpiderProducer.java index 5138938dfb..852c915edc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/Spiderman.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/Spiderman.java index 74f19e6aa1..66cfcc9e78 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/Spiderman.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/Spiderman.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpidermanProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpidermanProducer.java index 3126bb4b1f..976f716d08 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpidermanProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/parameterizedTypeWithWildcard/SpidermanProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TProducer.java index 31585d2fea..dda7136fff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java index dead3b72fd..5794c540ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/typeVariableReturnType/TypeVariableReturnTypeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,7 +38,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "ib"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "la") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "ib"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "la") }) public void testTypeVariableNotAllowed() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Acorn.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Acorn.java index 0ccae78a0d..343a2212d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Acorn.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Acorn.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Animal.java index 4b2b15499e..a0eb925341 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AnimalStereotype.java index 0c775226b6..666b4a3e9b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AnimalStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -public @interface AnimalStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +public @interface AnimalStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Apple.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Apple.java index 60cbbc050b..a1578441bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Apple.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Apple.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -public class Apple { - private AppleTree tree; - - public Apple(AppleTree tree) { - this.tree = tree; - } - - public AppleTree getTree() { - return tree; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +public class Apple { + private AppleTree tree; + + public Apple(AppleTree tree) { + this.tree = tree; + } + + public AppleTree getTree() { + return tree; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AppleTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AppleTree.java index 70105a1816..846055ff4c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AppleTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/AppleTree.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class AppleTree { - @Produces - @Yummy - public Apple produceApple() { - return new Apple(this); - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class AppleTree { + @Produces + @Yummy + public Apple produceApple() { + return new Apple(this); + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Bite.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Bite.java index 51cd6ca990..50cc820541 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Bite.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Bite.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java index 99615f38d1..e8e3cecbe7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/BlackWidow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Cherry.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Cherry.java index ec15925c8e..9fe2bec0a5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Cherry.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Cherry.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DaddyLongLegs.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DaddyLongLegs.java index 7db9bd7bfc..353852af7d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DaddyLongLegs.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DaddyLongLegs.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -public class DaddyLongLegs extends Spider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +public class DaddyLongLegs extends Spider { + +} 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 ec802945cd..65fe3740ff 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Deadliest { - class Literal extends AnnotationLiteral implements Deadliest { - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DeadlyAnimal.java index 24ad3c74e8..9aa4d84e91 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DeadlySpider.java index 2df0615d4b..64d14c352f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DefangedTarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DefangedTarantula.java index bedbd4f4be..f81b3dae9f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DefangedTarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/DefangedTarantula.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/FunnelWeaver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/FunnelWeaver.java index ed142a77c0..0339a72af5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/FunnelWeaver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/FunnelWeaver.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - public class FunnelWeaver { String name; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GeneralListProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GeneralListProducer.java index 53c589c3a1..0e1d24beeb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GeneralListProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GeneralListProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GrannySmithAppleTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GrannySmithAppleTree.java index 6d11dfe8e6..6bd0909061 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GrannySmithAppleTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GrannySmithAppleTree.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class GrannySmithAppleTree extends AppleTree { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class GrannySmithAppleTree extends AppleTree { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GreatGrannySmithAppleTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GreatGrannySmithAppleTree.java index 9dca384870..00550a119b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GreatGrannySmithAppleTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/GreatGrannySmithAppleTree.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class GreatGrannySmithAppleTree extends GrannySmithAppleTree { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class GreatGrannySmithAppleTree extends GrannySmithAppleTree { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/LadybirdSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/LadybirdSpider.java index 8480635b74..98cbb309bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/LadybirdSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/LadybirdSpider.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import java.io.Serializable; - -import jakarta.enterprise.context.ApplicationScoped; - -@ApplicationScoped -public class LadybirdSpider extends Spider implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 3406592573483935477L; - - public void spinWeb() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import java.io.Serializable; + +import jakarta.enterprise.context.ApplicationScoped; + +@ApplicationScoped +public class LadybirdSpider extends Spider implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 3406592573483935477L; + + public void spinWeb() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java index 7100590cc4..cee564d42f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/NonBeanWithStaticProducerMethod.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/OakTree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/OakTree.java index 61a3075ca1..4f36f3e7cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/OakTree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/OakTree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Pollen.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Pollen.java index 5225ae46a1..beefd56cc9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Pollen.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Pollen.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 c1e8c27e64..40d0945248 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 @@ -43,7 +43,6 @@ import jakarta.enterprise.inject.IllegalProductException; import jakarta.enterprise.inject.literal.NamedLiteral; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.TypeLiteral; import org.jboss.arquillian.container.test.api.Deployment; @@ -72,7 +71,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "b"), @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "b"), + @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "a") }) public void testStaticMethod() throws Exception { assertEquals(getBeans(String.class, TAME_LITERAL).size(), 1); assertEquals(getContextualReference(String.class, TAME_LITERAL), BeanWithStaticProducerMethod.getString()); @@ -122,17 +122,21 @@ public void testParameterizedReturnType() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "c"), @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "a"), + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD, id = "c"), + @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "a"), @SpecAssertion(section = BUILTIN_QUALIFIERS, id = "aa"), @SpecAssertion(section = BUILTIN_QUALIFIERS, id = "ab") }) public void testDefaultBindingType() throws Exception { assertEquals(getCurrentManager().getBeans(Tarantula.class).size(), 1); assertEquals(getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers().size(), 2); - assertTrue(getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers().contains(Default.Literal.INSTANCE)); - assertTrue(getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers().contains(Any.Literal.INSTANCE)); + assertTrue(getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers() + .contains(Default.Literal.INSTANCE)); + assertTrue( + getCurrentManager().getBeans(Tarantula.class).iterator().next().getQualifiers().contains(Any.Literal.INSTANCE)); } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD_TYPES, id = "c"), @SpecAssertion(section = BEAN_TYPES, id = "l") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD_TYPES, id = "c"), + @SpecAssertion(section = BEAN_TYPES, id = "l") }) public void testApiTypeForClassReturn() throws Exception { assertEquals(getBeans(Tarantula.class).size(), 1); Bean tarantula = getBeans(Tarantula.class).iterator().next(); @@ -166,7 +170,8 @@ public void testApiTypeForPrimitiveReturn() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD_TYPES, id = "bb"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "i") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD_TYPES, id = "bb"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "i") }) public void testApiTypeForArrayTypeReturn() throws Exception { assertEquals(getBeans(Spider[].class).size(), 1); Bean spiders = getBeans(Spider[].class).iterator().next(); @@ -176,7 +181,8 @@ public void testApiTypeForArrayTypeReturn() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "be"), @SpecAssertion(section = PRODUCER_METHOD, id = "k"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "be"), + @SpecAssertion(section = PRODUCER_METHOD, id = "k"), @SpecAssertion(section = DECLARING_BEAN_QUALIFIERS, id = "b") }) public void testBindingType() throws Exception { assertEquals(getBeans(Tarantula.class, TAME_LITERAL).size(), 1); @@ -186,7 +192,8 @@ public void testBindingType() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "ba"), @SpecAssertion(section = PRODUCER_METHOD, id = "k") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "ba"), + @SpecAssertion(section = PRODUCER_METHOD, id = "k") }) public void testScopeType() throws Exception { assertEquals(getBeans(DaddyLongLegs.class, TAME_LITERAL).size(), 1); Bean daddyLongLegs = getBeans(DaddyLongLegs.class, TAME_LITERAL).iterator().next(); @@ -194,7 +201,8 @@ public void testScopeType() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "bb"), @SpecAssertion(section = DECLARING_BEAN_NAME, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "bb"), + @SpecAssertion(section = DECLARING_BEAN_NAME, id = "b") }) public void testNamedMethod() throws Exception { assertEquals(getBeans(BlackWidow.class, TAME_LITERAL).size(), 1); Bean blackWidowSpider = getBeans(BlackWidow.class, TAME_LITERAL).iterator().next(); @@ -202,7 +210,8 @@ public void testNamedMethod() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "bb"), @SpecAssertion(section = DEFAULT_NAME, id = "b"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "bb"), + @SpecAssertion(section = DEFAULT_NAME, id = "b"), @SpecAssertion(section = DEFAULT_NAME, id = "fb") }) public void testDefaultNamedMethod() throws Exception { String name = "produceDaddyLongLegs"; @@ -215,7 +224,8 @@ public void testDefaultNamedMethod() throws Exception { // Review 2.2 @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "b"), @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "ba"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_STEREOTYPES, id = "b"), + @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "ba"), @SpecAssertion(section = DEFAULT_SCOPE, id = "c"), @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "bd") }) public void testStereotypeSpecifiesScope() throws Exception { assertEquals(getBeans(WolfSpider.class, TAME_LITERAL).size(), 1); @@ -224,7 +234,8 @@ public void testStereotypeSpecifiesScope() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "da"), @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "dg") }) + @SpecAssertions({ @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "da"), + @SpecAssertion(section = MEMBER_LEVEL_INHERITANCE, id = "dg") }) public void testNonStaticProducerMethodNotInherited() { assertEquals(getBeans(Apple.class, new Yummy.Literal()).size(), 1); assertEquals(getContextualReference(Apple.class, new Yummy.Literal()).getTree().getClass(), AppleTree.class); @@ -239,7 +250,8 @@ public void testNonStaticProducerMethodNotInherited() { @Test @SpecAssertions({ @SpecAssertion(section = METHOD_CONSTRUCTOR_PARAMETER_QUALIFIERS, id = "a"), @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "i"), - @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "h"), @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "e") }) + @SpecAssertion(section = DECLARING_PRODUCER_METHOD, id = "h"), + @SpecAssertion(section = PRODUCER_OR_DISPOSER_METHODS_INVOCATION, id = "e") }) public void testBindingTypesAppliedToProducerMethodParameters() { Bean tarantula = getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); CreationalContext creationalContext = getCurrentManager().createCreationalContext(tarantula); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Spider.java index 5103fc6d7e..357f2a17e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Spider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -public class Spider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +public class Spider implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/SpiderProducer.java index 3e681f40da..8fe8b40db0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d66b0a435d..e6eac902e1 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Tame { - class Literal extends AnnotationLiteral implements Tame { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Tarantula.java index 4feb896da9..991e4cbccc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/Tarantula.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class Tarantula extends Spider implements DeadlySpider { - public int getDeathsCaused() { - return 1; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class Tarantula extends Spider implements DeadlySpider { + public int getDeathsCaused() { + return 1; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/WolfSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/WolfSpider.java index dfcb713a34..b88676ded9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/WolfSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/WolfSpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -public class WolfSpider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +public class WolfSpider implements Animal { + +} 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 a4a866b233..d28eabab83 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -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; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Yummy { - class Literal extends AnnotationLiteral implements Yummy { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/Bug.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Bug.java index 3d9c2cb99c..49c69d9a59 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Bug.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/Bug.java @@ -14,7 +14,6 @@ package org.jboss.cdi.tck.tests.implementation.producer.method.definition.name; - /** * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugProducer.java index bf124d6f81..c984688491 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugProducer.java @@ -19,7 +19,7 @@ import jakarta.inject.Named; /** - * + * * @author Martin Kouba */ @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugStereotype.java index e54cfc9210..12a443ca22 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/name/BugStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 4dac459952..44417247b3 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.name; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Crazy { - class Literal extends AnnotationLiteral implements Crazy { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.name; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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 a2528c691a..0435902fc7 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.name; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Funny { - class Literal extends AnnotationLiteral implements Funny { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.name; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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 c890c5f554..f0d685f722 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 @@ -22,7 +22,6 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -62,7 +61,8 @@ public void testJavaBeansPropertyName() { } @Test - @SpecAssertions({ @SpecAssertion(section = NAMED_STEREOTYPE, id = "aa"), @SpecAssertion(section = NAMED_STEREOTYPE, id = "ab") }) + @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 Funny.Literal()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Animal.java index eb2c24f17e..ff04ef258e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java index 19f6b6501f..d4450e9a25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/BrownRecluse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,7 @@ @Dependent public class BrownRecluse { - public @Produces - @FirstBorn - SpiderEgg layAnEgg(BeanManager beanManager) { + public @Produces @FirstBorn SpiderEgg layAnEgg(BeanManager beanManager) { assert beanManager != null : "Manager was not injected"; return new SpiderEgg(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Chicken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Chicken.java index a3112dd8ea..2142c98231 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Chicken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Chicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlyAnimal.java index f442dec755..8985b7c4a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlySpider.java index a11b33dba8..77936b50c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Delicious.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Delicious.java index bba472fa42..e2094cc219 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Delicious.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Delicious.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Egg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Egg.java index f7c9474ec5..1e95cdb2ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Egg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Egg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 707e979a60..83c9fdda8a 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 409955abe5..481862430f 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FooException.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FooException.java index 1e74fc1a17..8b87357624 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FooException.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/FooException.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,8 +16,8 @@ public class FooException extends RuntimeException { /** - * - */ + * + */ private static final long serialVersionUID = 6562854972213425887L; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lays.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lays.java index 851ab65867..c48705e892 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lays.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lays.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,10 +19,7 @@ @Dependent public class Lays { - public @Produces - @Null - @RequestScoped - PotatoChip makeChip() { + public @Produces @Null @RequestScoped PotatoChip makeChip() { return null; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lorry.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lorry.java index adb6b0ff1b..fb64279ed5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lorry.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Lorry.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java index 2d25d8eb70..1432f05b0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/LorryProducer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,7 @@ @Dependent public class LorryProducer_Broken { - public @Produces - @Fail - Lorry produceLorry() throws Exception { + public @Produces @Fail Lorry produceLorry() throws Exception { throw new Exception(); } 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 8f80aaddb2..3e05eaf50a 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Null { - class Literal extends AnnotationLiteral implements Null { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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 98ccd90812..a2399c62f6 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/PotatoChip.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/PotatoChip.java index 0e47c1c19b..c09e0fb22c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/PotatoChip.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/PotatoChip.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 55735d2f3e..bd97cc97b7 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -102,7 +102,8 @@ public void testCreateFailsIfProducerReturnsNullAndNotDependent() { } @Test - @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD_LIFECYCLE, id = "ma"), @SpecAssertion(section = PRODUCER_METHOD_LIFECYCLE, id = "r") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_METHOD_LIFECYCLE, id = "ma"), + @SpecAssertion(section = PRODUCER_METHOD_LIFECYCLE, id = "r") }) public void testProducerMethodBeanDestroy() { SpiderProducer.reset(); Set> beans = getCurrentManager().getBeans(Tarantula.class, PET_LITERAL); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Request.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Request.java index 7ae9674990..f19ea4d08f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Request.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Request.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Request { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Request { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Ship.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Ship.java index 14db9ced38..19cbd07ef7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Ship.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Ship.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java index 0824b04dab..9d1e4a1003 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/ShipProducer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,7 @@ @Dependent public class ShipProducer_Broken { - public @Produces - @Fail - Ship produceShip() throws FooException { + public @Produces @Fail Ship produceShip() throws FooException { throw new FooException(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Spider.java index 485ba20068..7aee3a9ce6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Spider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -public class Spider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +public class Spider implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderEgg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderEgg.java index fb4945ac26..b57f541126 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderEgg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderEgg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java index 92cc4a6f85..34386e69e1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -63,7 +63,6 @@ public static void resetTarantulaCreated() { SpiderProducer.tarantulaCreated = null; } - public static Tarantula getTarantulaCreated() { return tarantulaCreated; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java index f166475134..6d8314466e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/SpiderProducer_Broken.java @@ -1,30 +1,30 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Produces; - -@Dependent -public class SpiderProducer_Broken { - - @Produces - @RequestScoped - @Request - public Spider getRequestScopedSpider() { - return null; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Produces; + +@Dependent +public class SpiderProducer_Broken { + + @Produces + @RequestScoped + @Request + public Spider getRequestScopedSpider() { + return null; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Tarantula.java index 8d9ed49610..58436b69fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Tarantula.java @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; - -public class Tarantula extends Spider implements DeadlySpider { - private final String value; - private static int numberCreated = 0; - - public Tarantula(String value) { - this.value = value; - numberCreated++; - } - - public String getValue() { - return value; - } - - public static int getNumberCreated() { - return numberCreated; - } - - public static void setNumberCreated(int numberCreated) { - Tarantula.numberCreated = numberCreated; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.lifecycle; + +public class Tarantula extends Spider implements DeadlySpider { + private final String value; + private static int numberCreated = 0; + + public Tarantula(String value) { + this.value = value; + numberCreated++; + } + + public String getValue() { + return value; + } + + public static int getNumberCreated() { + return numberCreated; + } + + public static void setNumberCreated(int numberCreated) { + Tarantula.numberCreated = numberCreated; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Web.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Web.java index 85acfda8f9..09410f1fbb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Web.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/lifecycle/Web.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Antelope_NotBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Antelope_NotBean.java index ae9a158267..ded1b7a2e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Antelope_NotBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Antelope_NotBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Car.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Car.java index 852c06384b..46159fc49b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Car.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Car.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ClovenHoved.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ClovenHoved.java index c19dc0b358..97140e0e0b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ClovenHoved.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ClovenHoved.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Cow_NotBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Cow_NotBean.java index 6c18f8015b..e8423fecee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Cow_NotBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Cow_NotBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Donkey.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Donkey.java index 43e3a42589..08c9ffcb15 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Donkey.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Donkey.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/OuterClass.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/OuterClass.java index 3316ba9785..8a5cd1a54a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/OuterClass.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/OuterClass.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Sheep.java index 32cf71dc16..2f96ff0bb6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java index f93a9c54c6..0fe6301382 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -94,7 +94,8 @@ public void testInitializerAnnotatedConstructor() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "ba"), @SpecAssertion(section = DECLARING_MANAGED_BEAN, id = "a"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "ba"), + @SpecAssertion(section = DECLARING_MANAGED_BEAN, id = "a"), @SpecAssertion(section = BEAN_CONSTRUCTORS, id = "a"), @SpecAssertion(section = INSTANTIATION, id = "ba") }) public void testEmptyConstructorUsed() { Donkey.constructedCorrectly = false; @@ -103,7 +104,8 @@ public void testEmptyConstructorUsed() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "aa"), @SpecAssertion(section = INSTANTIATION, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "aa"), + @SpecAssertion(section = INSTANTIATION, id = "aa") }) public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception { getContextualReference(Turkey.class); Assert.assertTrue(Turkey.constructedCorrectly); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleExtension.java index d3fd45dc12..eb744b369d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/SimpleExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tame.java index 1f82631a35..dcc279ede5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tame.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.definition; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Tame { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.definition; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Tame { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tiger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tiger.java index cada65d566..9687262b7a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tiger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Tiger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Turkey.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Turkey.java index a32de4b305..3f3899de4d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Turkey.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/Turkey.java @@ -35,7 +35,7 @@ public Turkey() { } @Inject - public Turkey(@Tame String foo,@Tame Integer bar) { + public Turkey(@Tame String foo, @Tame Integer bar) { if (foo.equals(Turkey.foo) && bar.equals(Turkey.bar)) { constructedCorrectly = true; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/White.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/White.java index b4fb17508c..fe2c615946 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/White.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/White.java @@ -13,13 +13,13 @@ */ package org.jboss.cdi.tck.tests.implementation.simple.definition; -import jakarta.enterprise.inject.Stereotype; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.inject.Stereotype; + @Stereotype @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Bar.java index 428a9774fa..bbc12a55b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Foo.java index 36a30f3a9a..0b317e22d8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/InjectedFieldAnnotatedWithProducesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/InjectedFieldAnnotatedWithProducesTest.java index 6d58f5262f..f0d693c534 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/InjectedFieldAnnotatedWithProducesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/broken/field/InjectedFieldAnnotatedWithProducesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/ConstructorHasAsyncObservesParameterTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/ConstructorHasAsyncObservesParameterTest.java index e08b941320..c86b6131f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/ConstructorHasAsyncObservesParameterTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/ConstructorHasAsyncObservesParameterTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/FoodConsumerBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/FoodConsumerBroken.java index 4a40d99b5e..51e13914cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/FoodConsumerBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasAsyncObservesParameter/FoodConsumerBroken.java @@ -21,7 +21,7 @@ public class FoodConsumerBroken { @Inject - public FoodConsumerBroken(@ObservesAsync Food food){ + public FoodConsumerBroken(@ObservesAsync Food food) { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java index 28ad4e9963..6ebacfa331 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java index 4c5d815839..1ab20e5dba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/DisposingConstructor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/Duck.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/Duck.java index f1c79f0f3a..bc16f64bb9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/Duck.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/Duck.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java index 7d17ef2d04..8ff22d014a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/Duck.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/Duck.java index 8490a7e748..46e7d02041 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/Duck.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/Duck.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java index 08c7683be3..8e6f2aca13 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/constructorHasObservesParameter/ObservingConstructor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/Leopard_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/Leopard_Broken.java index 1c9a107403..3cbe18765c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/Leopard_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/Leopard_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/NormalScopedWithPublicFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/NormalScopedWithPublicFieldTest.java index 763965d945..8fe9029ed4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/NormalScopedWithPublicFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicField/NormalScopedWithPublicFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/Leopard.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/Leopard.java index fad5e2f0be..97e40cd015 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/Leopard.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/Leopard.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/NormalScopedWithPublicStaticFieldTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/NormalScopedWithPublicStaticFieldTest.java index 2b7ea9672c..56d608567a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/NormalScopedWithPublicStaticFieldTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/normalScopedWithPublicStaticField/NormalScopedWithPublicStaticFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java index c71ee7cc47..1ca73990b0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/Goose_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java index 37f2e6fcf0..7ff5f138f0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/tooManyInitializerAnnotatedConstructors/TooManyInitializerAnnotatedConstructorsTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Animal.java index 7df2fdcaa1..56bff129db 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/BookOrderProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/BookOrderProcessor.java index e19f50aeeb..cde0040a98 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/BookOrderProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/BookOrderProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/CdOrderProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/CdOrderProcessor.java index df500b7144..8d0b528586 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/CdOrderProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/CdOrderProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Cod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Cod.java index 3746693051..9136872b20 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Cod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Cod.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Egg.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Egg.java index 61ef576885..35764dea10 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Egg.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Egg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/EggProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/EggProducer.java index 573ba96c08..1d0ff66994 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/EggProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/EggProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Farm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Farm.java index 18a7089c8f..8561e274f3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Farm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FarmOffice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FarmOffice.java index 27e5d9a7d9..f62e186950 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FarmOffice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FarmOffice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishPond.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishPond.java index 91ad9dc1c2..5f26ad2068 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishPond.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishPond.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishStereotype.java index 770a53b5e0..a99630ef80 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FishStereotype.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Stereotype; -import jakarta.inject.Named; - -@Stereotype -@Target({ TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@Named -public @interface FishStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Stereotype; +import jakarta.inject.Named; + +@Stereotype +@Target({ TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@Named +public @interface FishStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FooException.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FooException.java index 1f20e55bea..e2ddad43dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FooException.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/FooException.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,8 +16,8 @@ public class FooException extends RuntimeException { /** - * - */ + * + */ private static final long serialVersionUID = 3250507068142756766L; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goldfish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goldfish.java index bf8a80362f..8a9e89b169 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goldfish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goldfish.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goose.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goose.java index e56c85dbfa..147cfefbbf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goose.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Goose.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IndirectOrderProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IndirectOrderProcessor.java index 1e8545655b..6f07cea637 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IndirectOrderProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IndirectOrderProcessor.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class IndirectOrderProcessor extends IntermediateOrderProcessor { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class IndirectOrderProcessor extends IntermediateOrderProcessor { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IntermediateOrderProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IntermediateOrderProcessor.java index fc66798743..362d968eb3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IntermediateOrderProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/IntermediateOrderProcessor.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class IntermediateOrderProcessor extends OrderProcessor { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class IntermediateOrderProcessor extends OrderProcessor { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Lorry_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Lorry_Broken.java index c922ff395d..b99775ac0f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Lorry_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Lorry_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/NovelOrderProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/NovelOrderProcessor.java index 823f36509e..0f3b747dd5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/NovelOrderProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/NovelOrderProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/OrderProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/OrderProcessor.java index 462d0b707e..bb692e99df 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/OrderProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/OrderProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RedSnapper.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RedSnapper.java index a42a7a727f..35177284ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RedSnapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RedSnapper.java @@ -1,35 +1,35 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; - -import jakarta.enterprise.context.RequestScoped; - -@FishStereotype -@RequestScoped -public class RedSnapper implements Animal { - - private boolean touched; - - public void ping() { - this.touched = true; - } - - /** - * @return the touched - */ - public boolean isTouched() { - return touched; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; + +import jakarta.enterprise.context.RequestScoped; + +@FishStereotype +@RequestScoped +public class RedSnapper implements Animal { + + private boolean touched; + + public void ping() { + this.touched = true; + } + + /** + * @return the touched + */ + public boolean isTouched() { + return touched; + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java index 98c0d21003..9f0e1dc647 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/RequestScopedAnimalStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Salmon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Salmon.java index ab6cdf80b7..577b94a9fe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Salmon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Salmon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/ShoeFactory.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/ShoeFactory.java index e74bd50e74..f34d93bb66 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/ShoeFactory.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/ShoeFactory.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java index 692f6ce3b5..b04c6b4215 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java @@ -63,7 +63,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "f"), @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "g"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "f"), + @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "g"), @SpecAssertion(section = METHOD_CONSTRUCTOR_PARAMETER_QUALIFIERS, id = "d") }) public void testInjectionOfParametersIntoBeanConstructor() { assert getBeans(FishPond.class).size() == 1; @@ -81,7 +82,8 @@ public void testQualifierTypeAnnotatedConstructor() { } @Test - @SpecAssertions({ @SpecAssertion(section = CREATIONAL_CONTEXT, id = "d"), @SpecAssertion(section = CREATIONAL_CONTEXT, id = "g") }) + @SpecAssertions({ @SpecAssertion(section = CREATIONAL_CONTEXT, id = "d"), + @SpecAssertion(section = CREATIONAL_CONTEXT, id = "g") }) public void testCreateReturnsSameBeanPushed() { final Contextual bean = getBeans(ShoeFactory.class).iterator().next(); final CreationalContexts.Inspectable creationalContext = createInspectableCreationalContext(bean); @@ -117,9 +119,11 @@ public void testManagedBean() { } @Test - @SpecAssertions({ @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "aa"), @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "aa"), + @SpecAssertions({ @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "aa"), + @SpecAssertion(section = DECLARING_BEAN_CONSTRUCTOR, id = "aa"), @SpecAssertion(section = INJECTED_FIELD_QUALIFIERS, id = "a"), @SpecAssertion(section = INJECTED_FIELDS, id = "a"), - @SpecAssertion(section = DECLARING_INJECTED_FIELD, id = "aa"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jg") }) + @SpecAssertion(section = DECLARING_INJECTED_FIELD, id = "aa"), + @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jg") }) public void testCreateInjectsFieldsDeclaredInJava() { assert getBeans(TunaFarm.class).size() == 1; TunaFarm tunaFarm = getContextualReference(TunaFarm.class); @@ -141,7 +145,8 @@ public void testContextCreatesNewInstanceForInjection() { } @Test - @SpecAssertions({ @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "aa"), @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "aa"), + @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "ba") }) public void testPostConstructPreDestroy() { assert getBeans(Farm.class).size() == 1; Bean farmBean = getBeans(Farm.class).iterator().next(); @@ -156,7 +161,8 @@ public void testPostConstructPreDestroy() { } @Test - @SpecAssertions({ @SpecAssertion(section = CONTEXTUAL_REFERENCE, id = "aa"), @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "ba"), + @SpecAssertions({ @SpecAssertion(section = CONTEXTUAL_REFERENCE, id = "aa"), + @SpecAssertion(section = MANAGED_BEAN_LIFECYCLE, id = "ba"), @SpecAssertion(section = CONTEXTUAL_REFERENCE, id = "c") }) public void testContextualDestroyDisposesWhenNecessary() { final Bean gooseBean = getBeans(Goose.class).iterator().next(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Synchronous.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Synchronous.java index 225cc3f1a2..7fd769ede0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Synchronous.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Synchronous.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tame.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tame.java index 125be44db2..c3f04047dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tame.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tame.java @@ -13,18 +13,18 @@ */ package org.jboss.cdi.tck.tests.implementation.simple.lifecycle; -import jakarta.inject.Qualifier; - import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.inject.Qualifier; + @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD }) @Retention(RetentionPolicy.RUNTIME) @Documented @Qualifier public @interface Tame { -} \ No newline at end of file +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tuna.java index e34d458a4b..05d315c04a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Tuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaFarm.java index f8833e329e..9a038e8d99 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaFarm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaProducer.java index 0028bcface..d275feb698 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/TunaProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Van_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Van_Broken.java index ae552680bc..19ecb91396 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Van_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/Van_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableBean.java index d24ca0b7a2..8b41b4c6fa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java index 9d382c7097..bc43403553 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/lifecycle/unproxyable/UnproxyableManagedBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Amazing.java b/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Amazing.java index 85303c909e..042a437eba 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Amazing.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Amazing.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Foo.java index b89fb4621d..8b65269543 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Foo.java @@ -17,7 +17,7 @@ import jakarta.enterprise.context.RequestScoped; /** - * + * */ @RequestScoped public class Foo extends Bar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Qux.java b/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Qux.java index 66a4132da4..2571ef998c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Qux.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/inheritance/generics/Qux.java @@ -15,7 +15,7 @@ package org.jboss.cdi.tck.tests.inheritance.generics; /** - * + * */ public class Qux extends Baz { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AccountTransaction.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AccountTransaction.java index 4d27196dd9..fd95aec7f3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AccountTransaction.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AccountTransaction.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 92de74d597..b420391a8c 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicFoo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicFoo.java index cf9eee023a..4f871d0836 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicFoo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicInterceptor.java index 57a57600ea..39f89c29ae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/AtomicInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/FileLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/FileLogger.java index 09c9419cd0..7fb9fad8a2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/FileLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/FileLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 93b07fb16c..2a7e4b71a3 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 @@ -24,9 +24,21 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.lang.annotation.Annotation; +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -37,17 +49,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * Tests related to the definition of interceptors, but not necessarily their execution. * @@ -114,10 +115,10 @@ public void testInterceptionType() { @Test @SpecAssertion(section = INTERCEPTOR, id = "f") public void testInstanceOfInterceptorForEveryEnabledInterceptor() { - List> annotationLiterals = Arrays.>asList(TRANSACTIONAL_LITERAL, + List> annotationLiterals = Arrays.> asList(TRANSACTIONAL_LITERAL, SECURE_LITERAL, MISSILE_LITERAL, LOGGED_LITERAL); - List> interceptorClasses = new ArrayList>(Arrays.>asList(AtomicInterceptor.class, + List> interceptorClasses = new ArrayList>(Arrays.> asList(AtomicInterceptor.class, MissileInterceptor.class, SecureInterceptor.class, TransactionalInterceptor.class, NetworkLogger.class, FileLogger.class, NotEnabledAtomicInterceptor.class)); @@ -157,7 +158,8 @@ public void testResolveInterceptorsReturnsOrderedList() { @SpecAssertions({ @SpecAssertion(section = BM_INTERCEPTOR_RESOLUTION, id = "b") }) public void testSameBindingTypesToResolveInterceptorsFails() { getCurrentManager() - .resolveInterceptors(InterceptionType.AROUND_INVOKE, new Transactional.TransactionalLiteral("a"), new Transactional.TransactionalLiteral("b")); + .resolveInterceptors(InterceptionType.AROUND_INVOKE, new Transactional.TransactionalLiteral("a"), + new Transactional.TransactionalLiteral("b")); } @Test(expectedExceptions = { IllegalArgumentException.class }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Loggable.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Loggable.java index b8a251502c..f8ab17870d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Loggable.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Loggable.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 3416c7d39a..c82edade17 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 bdbac12f4b..2191647462 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileInterceptor.java index 6142ffc3fe..8e9db640a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NetworkLogger.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NetworkLogger.java index 04a41f19e0..f47d9b5d41 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NetworkLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NetworkLogger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 27ce579287..4d54344755 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 @@ -6,15 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.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; @@ -25,6 +23,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java index 64a96cdcbb..ab94923f65 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 c31a7e2219..e58eed136a 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureInterceptor.java index 18e63f3f30..771de93296 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureTransaction.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureTransaction.java index 5c53270e1e..2ae8c93250 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureTransaction.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/SecureTransaction.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/ShoppingCart.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/ShoppingCart.java index b432c114fb..73a4414d73 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/ShoppingCart.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/ShoppingCart.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Transactional.java index 6200676945..c7e651ec19 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,18 +30,17 @@ @InterceptorBinding public @interface Transactional { - String value() default ""; public static class TransactionalLiteral extends AnnotationLiteral implements Transactional { private String value; - public TransactionalLiteral(String value){ + public TransactionalLiteral(String value) { this.value = value; } - public String value(){ + public String value() { return value; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/TransactionalInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/TransactionalInterceptor.java index cc3bf458e0..3da8509805 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/TransactionalInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/TransactionalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftIPBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftIPBean.java index eba0221e3c..c0294d0799 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftIPBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftIPBean.java @@ -18,7 +18,7 @@ @Dependent public class AntiAircraftIPBean { - + @Inject AntiAircraftMissileFinalClass antiAircraftMissileFinalClass; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftMissileFinalClass.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftMissileFinalClass.java index 9ec7483518..bb1ad3fe2a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftMissileFinalClass.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/AntiAircraftMissileFinalClass.java @@ -19,5 +19,5 @@ @FooBinding @RequestScoped -public final class AntiAircraftMissileFinalClass implements Serializable{ +public final class AntiAircraftMissileFinalClass implements Serializable { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java index 2d610be069..ffd99cbb70 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/DependentBeanFinalMethodInterceptorTest.java @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -33,7 +34,8 @@ public class DependentBeanFinalMethodInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(DependentBeanFinalMethodInterceptorTest.class) - .withClasses(FooBinding.class, MissileInterceptor.class, NuclearMissileFinalMethod.class, NuclearMissileIPBean.class) + .withClasses(FooBinding.class, MissileInterceptor.class, NuclearMissileFinalMethod.class, + NuclearMissileIPBean.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelIPBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelIPBean.java index e13c66453c..69f483f52b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelIPBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelIPBean.java @@ -18,9 +18,8 @@ @Dependent public class FinalClassClassLevelIPBean { - + @Inject FinalClassClassLevelMissile finalClassClassLevelMissile; - - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java index 0772aceaff..6139388e84 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelInterceptorTest.java @@ -39,7 +39,8 @@ public class FinalClassClassLevelInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(FinalClassClassLevelInterceptorTest.class) - .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassClassLevelMissile.class, FinalClassClassLevelIPBean.class) + .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassClassLevelMissile.class, + FinalClassClassLevelIPBean.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelMissile.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelMissile.java index 60357c7f39..4e2fd3effd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelMissile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassClassLevelMissile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelIPBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelIPBean.java index 9749b71745..681d413445 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelIPBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelIPBean.java @@ -18,7 +18,7 @@ @Dependent public class FinalClassMethodLevelIPBean { - + @Inject FinalClassMethodLevelMissile finalClassMethodLevelMissile; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelMissile.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelMissile.java index cc713c6e60..4b7a70115a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelMissile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FinalClassMethodLevelMissile.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor; - import jakarta.enterprise.context.Dependent; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FooBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FooBinding.java index 476bb8ed20..4c4933a1aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FooBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/FooBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/MissileInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/MissileInterceptor.java index 64efeac875..cd0173a43d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/MissileInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java index 08df1b29d7..8e26a08fa9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalClassInterceptorTest.java @@ -16,12 +16,12 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -34,7 +34,8 @@ public class NormalScopedBeanFinalClassInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(NormalScopedBeanFinalClassInterceptorTest.class) - .withClasses(FooBinding.class, MissileInterceptor.class, AntiAircraftMissileFinalClass.class, AntiAircraftIPBean.class) + .withClasses(FooBinding.class, MissileInterceptor.class, AntiAircraftMissileFinalClass.class, + AntiAircraftIPBean.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java index 8f8fa4bc45..647cd488bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NormalScopedBeanFinalMethodInterceptorTest.java @@ -16,12 +16,12 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -34,7 +34,8 @@ public class NormalScopedBeanFinalMethodInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(NormalScopedBeanFinalMethodInterceptorTest.class) - .withClasses(FooBinding.class, MissileInterceptor.class, SurfaceToAirMissileFinalMethod.class, SurfaceToAirIPBean.class) + .withClasses(FooBinding.class, MissileInterceptor.class, SurfaceToAirMissileFinalMethod.class, + SurfaceToAirIPBean.class) .build(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileFinalMethod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileFinalMethod.java index cc81c573a5..b58e8f7c21 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileFinalMethod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileFinalMethod.java @@ -18,8 +18,8 @@ @FooBinding @Dependent public class NuclearMissileFinalMethod { - - public final void nuclearSolution(){ - + + public final void nuclearSolution() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileIPBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileIPBean.java index 889d4fa10c..27240fc5b2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileIPBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/NuclearMissileIPBean.java @@ -18,7 +18,7 @@ @Dependent public class NuclearMissileIPBean { - + @Inject NuclearMissileFinalMethod nuclearMissileFinalMethod; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirIPBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirIPBean.java index e5fb0a67cb..5cf810452b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirIPBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirIPBean.java @@ -18,7 +18,7 @@ @Dependent public class SurfaceToAirIPBean { - + @Inject SurfaceToAirMissileFinalMethod missile; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirMissileFinalMethod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirMissileFinalMethod.java index b7df32c14a..32c455e5d6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirMissileFinalMethod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/SurfaceToAirMissileFinalMethod.java @@ -19,9 +19,9 @@ @FooBinding @RequestScoped -public class SurfaceToAirMissileFinalMethod implements Serializable{ - - public final void fire(){ - +public class SurfaceToAirMissileFinalMethod implements Serializable { + + public final void fire() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/FooPayload.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/FooPayload.java index c1a644ea7d..168652192e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/FooPayload.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/FooPayload.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java index a27579a3a4..77a00372e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/InterceptorWithObserverMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,19 +16,19 @@ import static org.jboss.cdi.tck.cdi.Sections.OBSERVES; import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; /** * Test that interceptors may not declare observer methods. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/Transactional.java index 8830bef9a6..27c6778310 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalInterceptor.java index bc7c5ee95c..9c9bb217aa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalService.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalService.java index a3d6d70840..f08d99c1e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalService.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/TransactionalService.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/InterceptorWithAsyncObserverMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/InterceptorWithAsyncObserverMethodTest.java index b4e708c8d9..05f749ff91 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/InterceptorWithAsyncObserverMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/InterceptorWithAsyncObserverMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/Transactional.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/Transactional.java index 68764fbbc9..ccabd94485 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/Transactional.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/Transactional.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalInterceptor.java index 330cf4e2d7..0293dc6b15 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalService.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalService.java index 2921abc9c3..1b1643ea6f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalService.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/observer/async/TransactionalService.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Culinary.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Culinary.java index 8421fc6b66..fb263c1a2f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Culinary.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Culinary.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/European.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/European.java index 900cddf146..33b3e1245c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/European.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/European.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/EuropeanLarch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/EuropeanLarch.java index ea78c009cb..3e9a33edea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/EuropeanLarch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/EuropeanLarch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedBySquirrel.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedBySquirrel.java index 043764e55c..9d0f43fcf8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedBySquirrel.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedBySquirrel.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedByWoodpecker.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedByWoodpecker.java index 049bfc909a..dcb80cf351 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedByWoodpecker.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/GuardedByWoodpecker.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Herb.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Herb.java index 62d1c508b7..0a4c17ec8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Herb.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Herb.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java index 1823236be7..db693e149b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/InterceptorBindingInheritanceTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -30,7 +29,7 @@ /** * Test interceptor binding inheritance. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -47,7 +46,8 @@ public static WebArchive createTestArchive() { private String woodpecker = WoodpeckerInterceptor.class.getName(); @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "ad"), @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "ada") }) + @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "ad"), + @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "ada") }) public void testInterceptorBindingDirectlyInheritedFromManagedBean(Larch larch) throws Exception { Plant.clearInspections(); larch.pong(); @@ -56,7 +56,8 @@ public void testInterceptorBindingDirectlyInheritedFromManagedBean(Larch larch) } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "aj"), @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "aja") }) + @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "aj"), + @SpecAssertion(section = TYPE_LEVEL_INHERITANCE, id = "aja") }) public void testInterceptorBindingIndirectlyInheritedFromManagedBean(@European Larch europeanLarch) throws Exception { Plant.clearInspections(); europeanLarch.pong(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Larch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Larch.java index 39116afc59..7fd95b9fd1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Larch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Larch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Ping.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Ping.java index 616725734d..543700463d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Ping.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Ping.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Plant.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Plant.java index 5b074717e9..8ad7c50ad3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Plant.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Plant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/PongPlant.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/PongPlant.java index 1ac3029cfd..087d91ac55 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/PongPlant.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/PongPlant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Rosehip.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Rosehip.java index 426a6550bb..fe22cf73c1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Rosehip.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Rosehip.java @@ -10,7 +10,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Shrub.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Shrub.java index 7126a06d42..fe093f30f0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Shrub.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Shrub.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/SquirrelInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/SquirrelInterceptor.java index c3c330271e..32a63c85c2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/SquirrelInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/SquirrelInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Thyme.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Thyme.java index 4bc69e42cf..79da4ea34e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Thyme.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Thyme.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Tree.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Tree.java index 0fe61eb9ac..d998b39453 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Tree.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/Tree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/WoodpeckerInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/WoodpeckerInterceptor.java index b78f3f374f..260ef8120a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/WoodpeckerInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/WoodpeckerInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Airbus.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Airbus.java index 23f6516878..71f5fb273f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Airbus.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Airbus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Boeing.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Boeing.java index 7f5e49b028..01cb5b4476 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Boeing.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Boeing.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Fighter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Fighter.java index e5782045ae..a52c0497a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Fighter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Fighter.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FighterStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FighterStereotype.java index f8927c8c44..cccff923d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FighterStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FighterStereotype.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.interceptors.definition.inheritance.broken.binding; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.inject.Stereotype; - -@LandingBinding -@Inherited -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -public @interface FighterStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.interceptors.definition.inheritance.broken.binding; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.inject.Stereotype; + +@LandingBinding +@Inherited +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +public @interface FighterStereotype { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java index 8ddaa87b96..cbb139b321 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedClassLevelInterceptorTest.java @@ -22,9 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java index 8464ea41e5..41f09cb6d7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalClassWithInheritedStereotypeInterceptorTest.java @@ -22,9 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java index 00414c12e4..3a36b4b23f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedClassLevelInterceptorTest.java @@ -22,9 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java index 7cba38a1c9..037fdc656d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/FinalMethodWithInheritedStereotypeInterceptorTest.java @@ -22,9 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Jumbojet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Jumbojet.java index dd1e9d5e52..ae8c8f3fef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Jumbojet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Jumbojet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingBinding.java index 4d138760ad..bf1e3d5233 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingInterceptor.java index fc793c9894..3dc1b070d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/LandingInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Messerschmitt.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Messerschmitt.java index 75918155f1..5278c369cb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Messerschmitt.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Messerschmitt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Spitfire.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Spitfire.java index 7004c5b4d4..c4d62bbd09 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Spitfire.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance/broken/binding/Spitfire.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/FirstInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/FirstInterceptor.java index 6fe78b0609..eeca0b9092 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/FirstInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/FirstInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,7 @@ @Interceptor @Secure -@Priority(Interceptor.Priority.APPLICATION+1) +@Priority(Interceptor.Priority.APPLICATION + 1) public class FirstInterceptor { @AroundInvoke diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Foo.java index fde0747359..db262c8cca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java index 113c4f1eb0..e408217270 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java @@ -17,19 +17,17 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import java.util.List; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.ActionSequence; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - @SpecVersion(spec = "cdi", version = "2.0") public class InterceptorOrderTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/SecondInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/SecondInterceptor.java index 6da3e2ed54..058bc11b7c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/SecondInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/SecondInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Secure.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Secure.java index 2f0f968b6f..766163746e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Secure.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/interceptorOrder/Secure.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java index 2c71b22cc5..0bbd37d4cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/AnimalCountInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,6 +31,7 @@ Operation value(); enum Operation { - INCREASE, DECREASE + INCREASE, + DECREASE } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/DecreasingInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/DecreasingInterceptor.java index 432d34629e..17509f7359 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/DecreasingInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/DecreasingInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/Farm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/Farm.java index 2f193ff740..852a9314f9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/Farm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.interceptors.definition.member; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.tests.interceptors.definition.member.AnimalCountInterceptorBinding.Operation; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/IncreasingInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/IncreasingInterceptor.java index c21a39d92a..fa958da34d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/IncreasingInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/IncreasingInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java index 466c27ef63..e22de0850a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/InterceptorBindingTypeWithMemberTest.java @@ -23,7 +23,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java index 8b3ff63592..19ac4c6467 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java index f0d403a36b..d49400c839 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/member/VehicleCountInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyBinding.java index 14542b178c..ea15b848ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyInterceptor.java index 5da21cf082..7a2e7da1a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/AlmightyInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java index ec85faa844..5941b5f7a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/InterceptorInvocationTest.java @@ -25,9 +25,6 @@ import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.cdi.tck.util.DependentInstance; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -49,7 +46,7 @@ public static WebArchive createTestArchive() { @Test @SpecAssertions({ @SpecAssertion(section = BIZ_METHOD, id = "a"), - @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "g"), @SpecAssertion(section = BIZ_METHOD, id = "aa")}) + @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "g"), @SpecAssertion(section = BIZ_METHOD, id = "aa") }) public void testManagedBeanIsIntercepted() { AlmightyInterceptor.reset(); @@ -69,7 +66,8 @@ public void testManagedBeanIsIntercepted() { } @Test - @SpecAssertions({ @SpecAssertion(section = BIZ_METHOD, id = "ad"), @SpecAssertion(section = INITIALIZER_METHODS, id = "f") }) + @SpecAssertions({ @SpecAssertion(section = BIZ_METHOD, id = "ad"), + @SpecAssertion(section = INITIALIZER_METHODS, id = "f") }) public void testInitializerMethodsNotIntercepted() { AlmightyInterceptor.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Missile.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Missile.java index ced99c4b02..6cab2ed45d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Missile.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Rye.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Rye.java index 6ad1d2f7df..df7155c619 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Rye.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Rye.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Warhead.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Warhead.java index c50cc61f6d..33f77c842e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Warhead.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Warhead.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Watcher.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Watcher.java index 4888ccd38e..eec472601b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Watcher.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Watcher.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Wheat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Wheat.java index 5d63522f3a..86e01a0c54 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Wheat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/Wheat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/WheatProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/WheatProducer.java index f35638798a..2965a730f2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/WheatProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/interceptors/invocation/WheatProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolder.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolder.java index 8d9c0cd272..d336ea1d43 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolder.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolder.java @@ -15,11 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers; -import jakarta.enterprise.invoke.Invoker; +import static org.testng.Assert.assertNotNull; import java.util.Map; -import static org.testng.Assert.assertNotNull; +import jakarta.enterprise.invoke.Invoker; public class InvokerHolder { private final Map> invokers; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderCreator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderCreator.java index 59cad83e70..c33dee0fc9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderCreator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderCreator.java @@ -15,14 +15,14 @@ */ package org.jboss.cdi.tck.tests.invokers; +import java.util.HashMap; +import java.util.Map; + import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.build.compatible.spi.Parameters; import jakarta.enterprise.inject.build.compatible.spi.SyntheticBeanCreator; import jakarta.enterprise.invoke.Invoker; -import java.util.HashMap; -import java.util.Map; - public class InvokerHolderCreator implements SyntheticBeanCreator { @Override public InvokerHolder create(Instance lookup, Parameters params) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderExtensionBase.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderExtensionBase.java index 61880508f5..16c8f17caa 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderExtensionBase.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/InvokerHolderExtensionBase.java @@ -15,22 +15,23 @@ */ package org.jboss.cdi.tck.tests.invokers; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Consumer; + import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; import jakarta.enterprise.inject.build.compatible.spi.InvokerInfo; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.InvokerBuilder; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Consumer; - public abstract class InvokerHolderExtensionBase { private final Map invokers = new LinkedHashMap<>(); protected final void registerInvokers(BeanInfo bean, InvokerFactory invokers, Set methods) { - registerInvokers(bean, invokers, methods, builder -> {}); + registerInvokers(bean, invokers, methods, builder -> { + }); } protected final void registerInvokers(BeanInfo bean, InvokerFactory invokers, Set methods, diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/SimpleInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/SimpleInvokerTest.java index b2b28d34d0..300d0cd00a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/SimpleInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/SimpleInvokerTest.java @@ -15,6 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers; +import static org.testng.Assert.assertEquals; + +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +28,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -32,11 +38,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class SimpleInvokerTest extends AbstractTest { @Deployment @@ -68,7 +69,7 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.USING_INVOKER_BUILDER, id = "a") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{1, List.of()}), "foobar1[]"); + assertEquals(hello.invoke(service, new Object[] { 1, List.of() }), "foobar1[]"); } @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/BadInstanceInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/BadInstanceInvokerTest.java index 93f3fc0a73..cfd44d7b35 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/BadInstanceInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/BadInstanceInvokerTest.java @@ -15,6 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertThrows; + +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +28,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,11 +41,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class BadInstanceInvokerTest extends AbstractTest { @Deployment @@ -70,16 +71,16 @@ public void synthesis(SyntheticComponents syn) { public void test(InvokerHolder invokers) { Invoker hello = invokers.get("hello"); assertThrows(RuntimeException.class, () -> { - hello.invoke(null, new Object[]{""}); + hello.invoke(null, new Object[] { "" }); }); assertThrows(RuntimeException.class, () -> { - hello.invoke(new Object(), new Object[]{""}); + hello.invoke(new Object(), new Object[] { "" }); }); assertThrows(RuntimeException.class, () -> { - hello.invoke("", new Object[]{""}); + hello.invoke("", new Object[] { "" }); }); assertThrows(RuntimeException.class, () -> { - hello.invoke(List.of(""), new Object[]{""}); + hello.invoke(List.of(""), new Object[] { "" }); }); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ExcessArgumentsInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ExcessArgumentsInvokerTest.java index 600d065078..62ff2556e2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ExcessArgumentsInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ExcessArgumentsInvokerTest.java @@ -15,6 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; + +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +28,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,11 +41,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class ExcessArgumentsInvokerTest extends AbstractTest { @Deployment @@ -68,12 +69,12 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.BEHAVIOR_OF_INVOKE, id = "k") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{"a", "ignored"}), "foobar_a"); - assertEquals(hello.invoke(new MyService(), new Object[]{"b", 1, 2, 3}), "foobar_b"); + assertEquals(hello.invoke(service, new Object[] { "a", "ignored" }), "foobar_a"); + assertEquals(hello.invoke(new MyService(), new Object[] { "b", 1, 2, 3 }), "foobar_b"); Invoker helloStatic = invokers.get("helloStatic"); - assertEquals(helloStatic.invoke(null, new Object[]{"c", new Object()}), "quux_c"); - assertEquals(helloStatic.invoke(null, new Object[]{"d", List.of(), Set.of()}), "quux_d"); + assertEquals(helloStatic.invoke(null, new Object[] { "c", new Object() }), "quux_c"); + assertEquals(helloStatic.invoke(null, new Object[] { "d", List.of(), Set.of() }), "quux_d"); } @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/GoodInstanceInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/GoodInstanceInvokerTest.java index 7e9b4c287f..d4285956ff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/GoodInstanceInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/GoodInstanceInvokerTest.java @@ -15,6 +15,8 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +25,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,8 +38,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class GoodInstanceInvokerTest extends AbstractTest { @Deployment @@ -73,12 +74,12 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.BEHAVIOR_OF_INVOKE, id = "dc") public void test(InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(getContextualReference(MyService.class), new Object[]{"1"}), "foobar_1"); - assertEquals(hello.invoke(new MyService(), new Object[]{"2"}), "foobar_2"); + assertEquals(hello.invoke(getContextualReference(MyService.class), new Object[] { "1" }), "foobar_1"); + assertEquals(hello.invoke(new MyService(), new Object[] { "2" }), "foobar_2"); Invoker helloInterface = invokers.get("helloInterface"); - assertEquals(helloInterface.invoke(getContextualReference(MyServiceInterface.class), new Object[]{"3"}), "quux_3"); - assertEquals(helloInterface.invoke(new MyService(), new Object[]{"4"}), "quux_4"); + assertEquals(helloInterface.invoke(getContextualReference(MyServiceInterface.class), new Object[] { "3" }), "quux_3"); + assertEquals(helloInterface.invoke(new MyService(), new Object[] { "4" }), "quux_4"); } public interface MyServiceInterface { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InstanceMethodInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InstanceMethodInvokerTest.java index 96403ffd44..e4ccd3830e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InstanceMethodInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InstanceMethodInvokerTest.java @@ -15,6 +15,14 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertThrows; +import static org.testng.Assert.expectThrows; + +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +31,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,14 +44,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertThrows; -import static org.testng.Assert.expectThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class InstanceMethodInvokerTest extends AbstractTest { @Deployment @@ -73,30 +74,30 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.USING_INVOKER, id = "c") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{0, List.of()}), "foobar0[]"); - assertEquals(hello.invoke(new MyService(), new Object[]{1, List.of()}), "foobar1[]"); + assertEquals(hello.invoke(service, new Object[] { 0, List.of() }), "foobar0[]"); + assertEquals(hello.invoke(new MyService(), new Object[] { 1, List.of() }), "foobar1[]"); assertThrows(RuntimeException.class, () -> { - hello.invoke(null, new Object[]{2, List.of()}); + hello.invoke(null, new Object[] { 2, List.of() }); }); Invoker helloDetyped = (Invoker) hello; - assertEquals("foobar3[]", helloDetyped.invoke(service, new Object[]{3, List.of()})); - assertEquals("foobar4[]", helloDetyped.invoke(new MyService(), new Object[]{4, List.of()})); + assertEquals("foobar3[]", helloDetyped.invoke(service, new Object[] { 3, List.of() })); + assertEquals("foobar4[]", helloDetyped.invoke(new MyService(), new Object[] { 4, List.of() })); assertThrows(RuntimeException.class, () -> { - helloDetyped.invoke(null, new Object[]{5, List.of()}); + helloDetyped.invoke(null, new Object[] { 5, List.of() }); }); Invoker doSomething = invokers.get("doSomething"); assertEquals(0, MyService.counter); assertNull(doSomething.invoke(service, null)); assertEquals(1, MyService.counter); - assertNull(doSomething.invoke(new MyService(), new Object[]{})); + assertNull(doSomething.invoke(new MyService(), new Object[] {})); assertEquals(2, MyService.counter); Invoker fail = invokers.get("fail"); - assertNull(fail.invoke(service, new Object[]{false})); + assertNull(fail.invoke(service, new Object[] { false })); IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> { - fail.invoke(service, new Object[]{true}); + fail.invoke(service, new Object[] { true }); }); assertEquals("expected", ex.getMessage()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InterceptedMethodInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InterceptedMethodInvokerTest.java index f38454f0ef..086b5e666b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InterceptedMethodInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InterceptedMethodInvokerTest.java @@ -15,6 +15,15 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.util.List; +import java.util.Set; + import jakarta.annotation.Priority; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; @@ -28,6 +37,7 @@ import jakarta.interceptor.Interceptor; import jakarta.interceptor.InterceptorBinding; import jakarta.interceptor.InvocationContext; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -40,15 +50,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class InterceptedMethodInvokerTest extends AbstractTest { @Deployment @@ -77,12 +78,12 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.USING_INVOKER, id = "d") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{0, List.of("a")}), "intercepted: foobar0[a]"); + assertEquals(hello.invoke(service, new Object[] { 0, List.of("a") }), "intercepted: foobar0[a]"); // not a contextual reference, not intercepted - assertEquals(hello.invoke(new MyService(), new Object[]{1, List.of("b")}), "foobar1[b]"); + assertEquals(hello.invoke(new MyService(), new Object[] { 1, List.of("b") }), "foobar1[b]"); } - @Target({ElementType.TYPE, ElementType.METHOD}) + @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @InterceptorBinding public @interface MyInterceptorBinding { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerAssignabilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerAssignabilityTest.java index 549aecd67d..da2241900b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerAssignabilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerAssignabilityTest.java @@ -15,6 +15,17 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertThrows; +import static org.testng.Assert.fail; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Collection; +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -24,6 +35,7 @@ import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; import jakarta.enterprise.lang.model.declarations.MethodInfo; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -36,17 +48,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.io.Serializable; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; -import static org.testng.Assert.fail; - @SpecVersion(spec = "cdi", version = "4.1") public class InvokerAssignabilityTest extends AbstractTest { @Deployment @@ -110,35 +111,35 @@ public void testNonNull(MyService service, InvokerHolder invokers) { assertOK(invokers, service, "helloCollection", array(List.of())); assertOK(invokers, service, "helloCollection", array(Set.of())); assertOK(invokers, service, "helloSerializable", array(1)); // Number is Serializable - assertOK(invokers, service, "helloSerializable", array(new Object[]{})); - assertOK(invokers, service, "helloSerializable", array(new String[]{})); + assertOK(invokers, service, "helloSerializable", array(new Object[] {})); + assertOK(invokers, service, "helloSerializable", array(new String[] {})); assertOK(invokers, service, "helloObject", array("")); assertOK(invokers, service, "helloObject", array(List.of())); assertOK(invokers, service, "helloObject", array(new Object())); - assertOK(invokers, service, "helloObject", array(new int[]{})); - assertOK(invokers, service, "helloObject", array(new String[]{})); - assertOK(invokers, service, "helloObject", array(new List[]{})); - assertOK(invokers, service, "helloObject", array(new Object[]{})); - - assertOK(invokers, service, "helloBooleanArray", array(new boolean[]{true})); - assertOK(invokers, service, "helloByteArray", array(new byte[]{(byte) 1})); - assertOK(invokers, service, "helloShortArray", array(new short[]{(short) 1})); - assertOK(invokers, service, "helloIntArray", array(new int[]{1})); - assertOK(invokers, service, "helloLongArray", array(new long[]{1L})); - assertOK(invokers, service, "helloFloatArray", array(new float[]{1.0F})); - assertOK(invokers, service, "helloDoubleArray", array(new double[]{1.0})); - assertOK(invokers, service, "helloCharArray", array(new char[]{'a'})); - assertOK(invokers, service, "helloStringArray", array(new String[]{})); - assertOK(invokers, service, "helloObjectArray", array(new String[]{})); - assertOK(invokers, service, "helloObjectArray", array(new Object[]{})); - - assertOK(invokers, service, "helloCollectionArrayArray", array(new List[][]{})); - assertOK(invokers, service, "helloCollectionArrayArray", array(new Set[][]{})); - assertOK(invokers, service, "helloObjectArrayArray", array(new List[][]{})); - assertOK(invokers, service, "helloObjectArrayArray", array(new Set[][]{})); - assertOK(invokers, service, "helloObjectArrayArray", array(new String[][]{})); - assertOK(invokers, service, "helloObjectArrayArray", array(new Object[][]{})); - assertOK(invokers, service, "helloObjectArrayArray", array(new Object[][][]{})); + assertOK(invokers, service, "helloObject", array(new int[] {})); + assertOK(invokers, service, "helloObject", array(new String[] {})); + assertOK(invokers, service, "helloObject", array(new List[] {})); + assertOK(invokers, service, "helloObject", array(new Object[] {})); + + assertOK(invokers, service, "helloBooleanArray", array(new boolean[] { true })); + assertOK(invokers, service, "helloByteArray", array(new byte[] { (byte) 1 })); + assertOK(invokers, service, "helloShortArray", array(new short[] { (short) 1 })); + assertOK(invokers, service, "helloIntArray", array(new int[] { 1 })); + assertOK(invokers, service, "helloLongArray", array(new long[] { 1L })); + assertOK(invokers, service, "helloFloatArray", array(new float[] { 1.0F })); + assertOK(invokers, service, "helloDoubleArray", array(new double[] { 1.0 })); + assertOK(invokers, service, "helloCharArray", array(new char[] { 'a' })); + assertOK(invokers, service, "helloStringArray", array(new String[] {})); + assertOK(invokers, service, "helloObjectArray", array(new String[] {})); + assertOK(invokers, service, "helloObjectArray", array(new Object[] {})); + + assertOK(invokers, service, "helloCollectionArrayArray", array(new List[][] {})); + assertOK(invokers, service, "helloCollectionArrayArray", array(new Set[][] {})); + assertOK(invokers, service, "helloObjectArrayArray", array(new List[][] {})); + assertOK(invokers, service, "helloObjectArrayArray", array(new Set[][] {})); + assertOK(invokers, service, "helloObjectArrayArray", array(new String[][] {})); + assertOK(invokers, service, "helloObjectArrayArray", array(new Object[][] {})); + assertOK(invokers, service, "helloObjectArrayArray", array(new Object[][][] {})); assertFail(invokers, service, "helloBoolean", array(1)); assertFail(invokers, service, "helloByte", array(1)); @@ -186,27 +187,27 @@ public void testNonNull(MyService service, InvokerHolder invokers) { assertFail(invokers, service, "helloCollection", array(new Object())); assertFail(invokers, service, "helloSerializable", array(new Object())); - assertFail(invokers, service, "helloBooleanArray", array(new int[]{1})); - assertFail(invokers, service, "helloByteArray", array(new int[]{1})); - assertFail(invokers, service, "helloShortArray", array(new int[]{1})); - assertFail(invokers, service, "helloIntArray", array(new long[]{1L})); - assertFail(invokers, service, "helloLongArray", array(new int[]{1})); - assertFail(invokers, service, "helloFloatArray", array(new double[]{1.0})); - assertFail(invokers, service, "helloDoubleArray", array(new float[]{1.0F})); - assertFail(invokers, service, "helloCharArray", array(new int[]{1})); + assertFail(invokers, service, "helloBooleanArray", array(new int[] { 1 })); + assertFail(invokers, service, "helloByteArray", array(new int[] { 1 })); + assertFail(invokers, service, "helloShortArray", array(new int[] { 1 })); + assertFail(invokers, service, "helloIntArray", array(new long[] { 1L })); + assertFail(invokers, service, "helloLongArray", array(new int[] { 1 })); + assertFail(invokers, service, "helloFloatArray", array(new double[] { 1.0 })); + assertFail(invokers, service, "helloDoubleArray", array(new float[] { 1.0F })); + assertFail(invokers, service, "helloCharArray", array(new int[] { 1 })); assertFail(invokers, service, "helloStringArray", array("")); assertFail(invokers, service, "helloStringArray", array(new Object())); - assertFail(invokers, service, "helloStringArray", array(new String[][]{})); - assertFail(invokers, service, "helloStringArray", array(new Object[]{})); + assertFail(invokers, service, "helloStringArray", array(new String[][] {})); + assertFail(invokers, service, "helloStringArray", array(new Object[] {})); assertFail(invokers, service, "helloObjectArray", array("")); assertFail(invokers, service, "helloObjectArray", array(new Object())); - assertFail(invokers, service, "helloCollectionArrayArray", array(new List[]{})); - assertFail(invokers, service, "helloCollectionArrayArray", array(new Set[]{})); - assertFail(invokers, service, "helloCollectionArrayArray", array(new List[][][]{})); - assertFail(invokers, service, "helloCollectionArrayArray", array(new Set[][][]{})); - assertFail(invokers, service, "helloCollectionArrayArray", array(new Object[][]{})); - assertFail(invokers, service, "helloObjectArrayArray", array(new Object[]{})); + assertFail(invokers, service, "helloCollectionArrayArray", array(new List[] {})); + assertFail(invokers, service, "helloCollectionArrayArray", array(new Set[] {})); + assertFail(invokers, service, "helloCollectionArrayArray", array(new List[][][] {})); + assertFail(invokers, service, "helloCollectionArrayArray", array(new Set[][][] {})); + assertFail(invokers, service, "helloCollectionArrayArray", array(new Object[][] {})); + assertFail(invokers, service, "helloObjectArrayArray", array(new Object[] {})); assertFail(invokers, service, "helloObjectArrayArray", array(new Object())); } @@ -253,7 +254,7 @@ public void testNull(MyService service, InvokerHolder invokers) { // produces a single-element array whose only element is `obj` private static Object[] array(Object obj) { - return new Object[]{obj}; + return new Object[] { obj }; } private static void assertOK(InvokerHolder invokers, MyService instance, String methodName, Object[] arguments) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerVisibilityTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerVisibilityTest.java index 1e44a35f3c..68ff780ade 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerVisibilityTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/InvokerVisibilityTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; + +import java.util.List; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; @@ -24,6 +28,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.lang.model.declarations.MethodInfo; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -36,10 +41,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class InvokerVisibilityTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/MissingArgumentsInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/MissingArgumentsInvokerTest.java index e7a57d37c4..eaebd24d4f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/MissingArgumentsInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/MissingArgumentsInvokerTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertThrows; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +27,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,10 +40,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class MissingArgumentsInvokerTest extends AbstractTest { @Deployment @@ -72,10 +73,10 @@ public void test(MyService service, InvokerHolder invokers) { hello.invoke(service, null); }); assertThrows(RuntimeException.class, () -> { - hello.invoke(service, new Object[]{}); + hello.invoke(service, new Object[] {}); }); assertThrows(RuntimeException.class, () -> { - hello.invoke(new MyService(), new Object[]{1}); + hello.invoke(new MyService(), new Object[] { 1 }); }); Invoker helloStatic = invokers.get("helloStatic"); @@ -83,10 +84,10 @@ public void test(MyService service, InvokerHolder invokers) { helloStatic.invoke(null, null); }); assertThrows(RuntimeException.class, () -> { - helloStatic.invoke(null, new Object[]{""}); + helloStatic.invoke(null, new Object[] { "" }); }); assertThrows(RuntimeException.class, () -> { - hello.invoke(null, new Object[]{}); + hello.invoke(null, new Object[] {}); }); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveParametersInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveParametersInvokerTest.java index fa8f8b122a..5438431ea2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveParametersInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveParametersInvokerTest.java @@ -15,6 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertThrows; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +28,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,11 +41,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class PrimitiveParametersInvokerTest extends AbstractTest { @Deployment @@ -69,27 +70,27 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.BEHAVIOR_OF_INVOKE, id = "l") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{true, 'a', 1}), "foobar_true_a_1"); - assertEquals(hello.invoke(new MyService(), new Object[]{false, 'b', (short) 2}), "foobar_false_b_2"); + assertEquals(hello.invoke(service, new Object[] { true, 'a', 1 }), "foobar_true_a_1"); + assertEquals(hello.invoke(new MyService(), new Object[] { false, 'b', (short) 2 }), "foobar_false_b_2"); assertThrows(RuntimeException.class, () -> { - hello.invoke(new MyService(), new Object[]{null, null, null}); + hello.invoke(new MyService(), new Object[] { null, null, null }); }); assertThrows(RuntimeException.class, () -> { - hello.invoke(service, new Object[]{true, 'a', 1L}); + hello.invoke(service, new Object[] { true, 'a', 1L }); }); assertThrows(RuntimeException.class, () -> { - hello.invoke(service, new Object[]{true, 'a', 1.0}); + hello.invoke(service, new Object[] { true, 'a', 1.0 }); }); Invoker helloStatic = invokers.get("helloStatic"); - assertEquals(helloStatic.invoke(null, new Object[]{1L, 1.0}), "quux_1_1.0"); - assertEquals(helloStatic.invoke(null, new Object[]{1, 1.0}), "quux_1_1.0"); - assertEquals(helloStatic.invoke(null, new Object[]{1L, 1.0F}), "quux_1_1.0"); + assertEquals(helloStatic.invoke(null, new Object[] { 1L, 1.0 }), "quux_1_1.0"); + assertEquals(helloStatic.invoke(null, new Object[] { 1, 1.0 }), "quux_1_1.0"); + assertEquals(helloStatic.invoke(null, new Object[] { 1L, 1.0F }), "quux_1_1.0"); assertThrows(RuntimeException.class, () -> { - helloStatic.invoke(null, new Object[]{null, null}); + helloStatic.invoke(null, new Object[] { null, null }); }); assertThrows(RuntimeException.class, () -> { - helloStatic.invoke(null, new Object[]{1.0, 1.0}); + helloStatic.invoke(null, new Object[] { 1.0, 1.0 }); }); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveReturnValueInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveReturnValueInvokerTest.java index 10d433511f..2d747644d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveReturnValueInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/PrimitiveReturnValueInvokerTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +27,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,10 +40,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class PrimitiveReturnValueInvokerTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/StaticMethodInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/StaticMethodInvokerTest.java index 9050d769c5..9bd0a6d04a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/StaticMethodInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/StaticMethodInvokerTest.java @@ -15,6 +15,13 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.expectThrows; + +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +30,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,13 +43,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.expectThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class StaticMethodInvokerTest extends AbstractTest { @Deployment @@ -73,28 +74,28 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.BEHAVIOR_OF_INVOKE, id = "a") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{0, List.of()}), "foobar0[]"); - assertEquals(hello.invoke(new MyService(), new Object[]{1, List.of()}), "foobar1[]"); - assertEquals(hello.invoke(null, new Object[]{2, List.of()}), "foobar2[]"); + assertEquals(hello.invoke(service, new Object[] { 0, List.of() }), "foobar0[]"); + assertEquals(hello.invoke(new MyService(), new Object[] { 1, List.of() }), "foobar1[]"); + assertEquals(hello.invoke(null, new Object[] { 2, List.of() }), "foobar2[]"); Invoker helloDetyped = (Invoker) hello; - assertEquals("foobar3[]", helloDetyped.invoke(service, new Object[]{3, List.of()})); - assertEquals("foobar4[]", helloDetyped.invoke(new MyService(), new Object[]{4, List.of()})); - assertEquals("foobar5[]", helloDetyped.invoke(null, new Object[]{5, List.of()})); + assertEquals("foobar3[]", helloDetyped.invoke(service, new Object[] { 3, List.of() })); + assertEquals("foobar4[]", helloDetyped.invoke(new MyService(), new Object[] { 4, List.of() })); + assertEquals("foobar5[]", helloDetyped.invoke(null, new Object[] { 5, List.of() })); Invoker doSomething = invokers.get("doSomething"); assertEquals(0, MyService.counter); assertNull(doSomething.invoke(service, null)); assertEquals(1, MyService.counter); - assertNull(doSomething.invoke(new MyService(), new Object[]{})); + assertNull(doSomething.invoke(new MyService(), new Object[] {})); assertEquals(2, MyService.counter); - assertNull(doSomething.invoke(null, new Object[]{})); + assertNull(doSomething.invoke(null, new Object[] {})); assertEquals(3, MyService.counter); Invoker fail = invokers.get("fail"); - assertNull(fail.invoke(null, new Object[]{false})); + assertNull(fail.invoke(null, new Object[] { false })); IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> { - fail.invoke(null, new Object[]{true}); + fail.invoke(null, new Object[] { true }); }); assertEquals("expected", ex.getMessage()); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ThrowingInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ThrowingInvokerTest.java index 7bdfadfbfe..41cbeb3b30 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ThrowingInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ThrowingInvokerTest.java @@ -15,6 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertThrows; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +28,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,11 +41,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class ThrowingInvokerTest extends AbstractTest { @Deployment @@ -70,14 +71,14 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.BEHAVIOR_OF_INVOKE, id = "n") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{false}), "foobar"); - assertThrows(IllegalArgumentException.class, () -> hello.invoke(service, new Object[]{true})); - assertEquals(hello.invoke(new MyService(), new Object[]{false}), "foobar"); - assertThrows(IllegalArgumentException.class, () -> hello.invoke(new MyService(), new Object[]{true})); + assertEquals(hello.invoke(service, new Object[] { false }), "foobar"); + assertThrows(IllegalArgumentException.class, () -> hello.invoke(service, new Object[] { true })); + assertEquals(hello.invoke(new MyService(), new Object[] { false }), "foobar"); + assertThrows(IllegalArgumentException.class, () -> hello.invoke(new MyService(), new Object[] { true })); Invoker helloStatic = invokers.get("helloStatic"); - assertEquals("quux", helloStatic.invoke(null, new Object[]{false})); - assertThrows(IllegalStateException.class, () -> helloStatic.invoke(null, new Object[]{true})); + assertEquals("quux", helloStatic.invoke(null, new Object[] { false })); + assertThrows(IllegalStateException.class, () -> helloStatic.invoke(null, new Object[] { true })); } @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VarargsMethodInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VarargsMethodInvokerTest.java index d599fb44d2..8b040fc719 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VarargsMethodInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VarargsMethodInvokerTest.java @@ -15,6 +15,12 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertThrows; + +import java.util.Arrays; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +29,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,12 +42,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Arrays; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class VarargsMethodInvokerTest extends AbstractTest { @Deployment @@ -69,17 +70,17 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.BEHAVIOR_OF_INVOKE, id = "f") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertEquals(hello.invoke(service, new Object[]{0, new String[]{}}), "foobar0[]"); - assertEquals(hello.invoke(new MyService(), new Object[]{1, new String[]{"a"}}), "foobar1[a]"); + assertEquals(hello.invoke(service, new Object[] { 0, new String[] {} }), "foobar0[]"); + assertEquals(hello.invoke(new MyService(), new Object[] { 1, new String[] { "a" } }), "foobar1[a]"); assertThrows(RuntimeException.class, () -> { - hello.invoke(null, new Object[]{1, "a"}); + hello.invoke(null, new Object[] { 1, "a" }); }); Invoker helloStatic = invokers.get("helloStatic"); - assertEquals(helloStatic.invoke(null, new Object[]{0, new String[]{"b"}}), "quux0[b]"); - assertEquals(helloStatic.invoke(null, new Object[]{1, new String[]{"c"}}), "quux1[c]"); + assertEquals(helloStatic.invoke(null, new Object[] { 0, new String[] { "b" } }), "quux0[b]"); + assertEquals(helloStatic.invoke(null, new Object[] { 1, new String[] { "c" } }), "quux1[c]"); assertThrows(RuntimeException.class, () -> { - helloStatic.invoke(null, new Object[]{1, "a"}); + helloStatic.invoke(null, new Object[] { 1, "a" }); }); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VoidMethodInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VoidMethodInvokerTest.java index a6839363ed..cda8067d1d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VoidMethodInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/VoidMethodInvokerTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertNull; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +27,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,10 +40,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertNull; - @SpecVersion(spec = "cdi", version = "4.1") public class VoidMethodInvokerTest extends AbstractTest { @Deployment @@ -67,11 +68,11 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.BEHAVIOR_OF_INVOKE, id = "m") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); - assertNull(hello.invoke(service, new Object[]{1})); - assertNull(hello.invoke(new MyService(), new Object[]{2})); + assertNull(hello.invoke(service, new Object[] { 1 })); + assertNull(hello.invoke(new MyService(), new Object[] { 2 })); Invoker helloStatic = invokers.get("helloStatic"); - assertNull(helloStatic.invoke(null, new Object[]{3})); + assertNull(helloStatic.invoke(null, new Object[] { 3 })); } @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ZeroParametersInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ZeroParametersInvokerTest.java index 9705589bc6..6e275c6f79 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ZeroParametersInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/basic/ZeroParametersInvokerTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.basic; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +27,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -35,10 +40,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class ZeroParametersInvokerTest extends AbstractTest { @Deployment @@ -68,11 +69,11 @@ public void synthesis(SyntheticComponents syn) { public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker hello = invokers.get("hello"); assertEquals(hello.invoke(service, null), "foobar"); - assertEquals(hello.invoke(new MyService(), new Object[]{}), "foobar"); + assertEquals(hello.invoke(new MyService(), new Object[] {}), "foobar"); Invoker helloStatic = invokers.get("helloStatic"); assertEquals(helloStatic.invoke(null, null), "quux"); - assertEquals(helloStatic.invoke(null, new Object[]{}), "quux"); + assertEquals(helloStatic.invoke(null, new Object[] {}), "quux"); } @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ConstructorInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ConstructorInvokerTest.java index d647c693dd..ff2a8ddc65 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ConstructorInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ConstructorInvokerTest.java @@ -22,6 +22,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Registration; import jakarta.enterprise.inject.spi.DeploymentException; import jakarta.enterprise.lang.model.declarations.MethodInfo; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/InterceptorInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/InterceptorInvokerTest.java index 6a9d6cf01d..d46127f227 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/InterceptorInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/InterceptorInvokerTest.java @@ -15,6 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers.invalid; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + import jakarta.annotation.Priority; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.InterceptorInfo; @@ -25,6 +30,7 @@ import jakarta.interceptor.Interceptor; import jakarta.interceptor.InterceptorBinding; import jakarta.interceptor.InvocationContext; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -35,11 +41,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - @SpecVersion(spec = "cdi", version = "4.1") public class InterceptorInvokerTest extends AbstractTest { @Deployment @@ -68,7 +69,7 @@ public void myInterceptorRegistration(InterceptorInfo bean, InvokerFactory invok public void trigger() { } - @Target({ElementType.TYPE, ElementType.METHOD}) + @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @InterceptorBinding public @interface MyInterceptorBinding { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/MethodFromDifferentClassInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/MethodFromDifferentClassInvokerTest.java index 0b2fafe092..fde91511d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/MethodFromDifferentClassInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/MethodFromDifferentClassInvokerTest.java @@ -23,6 +23,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Registration; import jakarta.enterprise.inject.spi.DeploymentException; import jakarta.enterprise.lang.model.declarations.MethodInfo; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ObjectMethodButNotToStringInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ObjectMethodButNotToStringInvokerTest.java index 13ca2026d6..9eb430da97 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ObjectMethodButNotToStringInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ObjectMethodButNotToStringInvokerTest.java @@ -22,6 +22,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Registration; import jakarta.enterprise.inject.spi.DeploymentException; import jakarta.enterprise.lang.model.declarations.MethodInfo; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/PrivateMethodInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/PrivateMethodInvokerTest.java index 8b4816a987..7ea5082d22 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/PrivateMethodInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/PrivateMethodInvokerTest.java @@ -21,6 +21,7 @@ import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; import jakarta.enterprise.inject.build.compatible.spi.Registration; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerFieldBeanInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerFieldBeanInvokerTest.java index ee62bed284..6b85b43743 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerFieldBeanInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerFieldBeanInvokerTest.java @@ -22,6 +22,7 @@ import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; import jakarta.enterprise.inject.build.compatible.spi.Registration; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerMethodBeanInvokerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerMethodBeanInvokerTest.java index 6aa68c2bed..45dc53957b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerMethodBeanInvokerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/invalid/ProducerMethodBeanInvokerTest.java @@ -22,6 +22,7 @@ import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; import jakarta.enterprise.inject.build.compatible.spi.Registration; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentArraySizeWithLookupTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentArraySizeWithLookupTest.java index f497110944..f87726ff7b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentArraySizeWithLookupTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentArraySizeWithLookupTest.java @@ -15,6 +15,11 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertThrows; + +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; @@ -24,6 +29,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -36,11 +42,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertThrows; - @SpecVersion(spec = "cdi", version = "4.1") public class ArgumentArraySizeWithLookupTest extends AbstractTest { @Deployment @@ -76,13 +77,13 @@ public void test(MyService service, InvokerHolder invokers) throws Exception { invoker.invoke(service, null); }); assertThrows(RuntimeException.class, () -> { - invoker.invoke(service, new Object[]{}); + invoker.invoke(service, new Object[] {}); }); assertThrows(RuntimeException.class, () -> { - invoker.invoke(service, new Object[]{null}); + invoker.invoke(service, new Object[] { null }); }); - assertEquals("foobar_1_2", invoker.invoke(service, new Object[]{null, null})); - assertEquals("foobar_1_2", invoker.invoke(service, new Object[]{null, null, null})); + assertEquals("foobar_1_2", invoker.invoke(service, new Object[] { null, null })); + assertEquals("foobar_1_2", invoker.invoke(service, new Object[] { null, null, null })); } @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupBeanManagerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupBeanManagerTest.java index 39fe385507..84340c612d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupBeanManagerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupBeanManagerTest.java @@ -15,6 +15,12 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; @@ -30,6 +36,7 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.invoke.Invoker; import jakarta.enterprise.util.TypeLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -42,12 +49,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class ArgumentLookupBeanManagerTest extends AbstractTest { @Deployment @@ -78,8 +79,8 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.CONFIGURING_LOOKUPS, id = "i") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker invoker = invokers.get("hello"); - assertEquals("foobar0", invoker.invoke(service, new Object[]{null})); - assertEquals("foobar1", invoker.invoke(service, new Object[]{null})); + assertEquals("foobar0", invoker.invoke(service, new Object[] { null })); + assertEquals("foobar1", invoker.invoke(service, new Object[] { null })); assertEquals(MyService.observed, List.of("foo", "bar", "foo", "bar")); @@ -97,7 +98,8 @@ public String hello(BeanManager beanManager) { int id = dependency.getId(); instance.destroy(dependency); - beanManager.getEvent().select(new TypeLiteral>() {}).fire(List.of("foo", "bar")); + beanManager.getEvent().select(new TypeLiteral>() { + }).fire(List.of("foo", "bar")); return "foobar" + id; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupDependentTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupDependentTest.java index 80c7e10dcf..1b09ccdca4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupDependentTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupDependentTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; @@ -26,7 +30,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; -import jakarta.enterprise.invoke.InvokerBuilder; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -39,10 +43,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class ArgumentLookupDependentTest extends AbstractTest { @Deployment @@ -73,9 +73,9 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.CONFIGURING_LOOKUPS, id = "i") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker invoker = invokers.get("hello"); - assertEquals("foobar0", invoker.invoke(service, new Object[]{null})); - assertEquals("foobar1", invoker.invoke(service, new Object[]{null})); - assertEquals("foobar2", invoker.invoke(service, new Object[]{null})); + assertEquals("foobar0", invoker.invoke(service, new Object[] { null })); + assertEquals("foobar1", invoker.invoke(service, new Object[] { null })); + assertEquals("foobar2", invoker.invoke(service, new Object[] { null })); assertEquals(3, MyDependency.CREATED); assertEquals(3, MyDependency.DESTROYED); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupEventTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupEventTest.java index 65692d270c..12f5668f6e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupEventTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupEventTest.java @@ -15,13 +15,15 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; +import static org.testng.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.Dependent; import jakarta.enterprise.event.Event; import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; @@ -29,6 +31,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -41,12 +44,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class ArgumentLookupEventTest extends AbstractTest { @Deployment @@ -76,8 +73,8 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.CONFIGURING_LOOKUPS, id = "dd") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker invoker = invokers.get("hello"); - invoker.invoke(service, new Object[]{null}); - invoker.invoke(service, new Object[]{null}); + invoker.invoke(service, new Object[] { null }); + invoker.invoke(service, new Object[] { null }); assertEquals(MyService.observed, List.of("foo", "bar", "foo", "bar")); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupInstanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupInstanceTest.java index e85682b429..dab380c7d8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupInstanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupInstanceTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; @@ -27,6 +31,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -39,10 +44,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class ArgumentLookupInstanceTest extends AbstractTest { @Deployment @@ -73,9 +74,9 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.CONFIGURING_LOOKUPS, id = "i") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker invoker = invokers.get("hello"); - assertEquals("foobar0_MyDependency", invoker.invoke(service, new Object[]{null})); - assertEquals("foobar1_MyDependency", invoker.invoke(service, new Object[]{null})); - assertEquals("foobar2_MyDependency", invoker.invoke(service, new Object[]{null})); + assertEquals("foobar0_MyDependency", invoker.invoke(service, new Object[] { null })); + assertEquals("foobar1_MyDependency", invoker.invoke(service, new Object[] { null })); + assertEquals("foobar2_MyDependency", invoker.invoke(service, new Object[] { null })); assertEquals(3, MyDependency.CREATED); assertEquals(3, MyDependency.DESTROYED); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupTest.java index 7e3e8f2d74..169cb68c74 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/ArgumentLookupTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; @@ -25,7 +29,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; -import jakarta.enterprise.invoke.InvokerBuilder; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -38,10 +42,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class ArgumentLookupTest extends AbstractTest { @Deployment @@ -71,9 +71,9 @@ public void synthesis(SyntheticComponents syn) { @SpecAssertion(section = Sections.CONFIGURING_LOOKUPS, id = "da") public void test(MyService service, InvokerHolder invokers) throws Exception { Invoker invoker = invokers.get("hello"); - assertEquals("foobar0", invoker.invoke(service, new Object[]{null})); - assertEquals("foobar0", invoker.invoke(service, new Object[]{null})); - assertEquals("foobar0", invoker.invoke(service, new Object[]{null})); + assertEquals("foobar0", invoker.invoke(service, new Object[] { null })); + assertEquals("foobar0", invoker.invoke(service, new Object[] { null })); + assertEquals("foobar0", invoker.invoke(service, new Object[] { null })); assertEquals(1, MyDependency.CREATED); assertEquals(0, MyDependency.DESTROYED); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupEqualToNumberOfParamsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupEqualToNumberOfParamsTest.java index 05c5fef7c4..e8110841f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupEqualToNumberOfParamsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupEqualToNumberOfParamsTest.java @@ -15,12 +15,15 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; import jakarta.enterprise.inject.build.compatible.spi.Messages; import jakarta.enterprise.inject.build.compatible.spi.Registration; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -34,8 +37,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - @SpecVersion(spec = "cdi", version = "4.1") public class BadArgumentLookupEqualToNumberOfParamsTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupGreaterThanNumberOfParamsTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupGreaterThanNumberOfParamsTest.java index 499e0d0a9a..4a6b09f8c8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupGreaterThanNumberOfParamsTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupGreaterThanNumberOfParamsTest.java @@ -15,12 +15,15 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; import jakarta.enterprise.inject.build.compatible.spi.Messages; import jakarta.enterprise.inject.build.compatible.spi.Registration; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -34,8 +37,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - @SpecVersion(spec = "cdi", version = "4.1") public class BadArgumentLookupGreaterThanNumberOfParamsTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupLessThanZeroTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupLessThanZeroTest.java index 37f3126005..328884b759 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupLessThanZeroTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/BadArgumentLookupLessThanZeroTest.java @@ -15,12 +15,15 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.InvokerFactory; import jakarta.enterprise.inject.build.compatible.spi.Messages; import jakarta.enterprise.inject.build.compatible.spi.Registration; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -34,8 +37,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - @SpecVersion(spec = "cdi", version = "4.1") public class BadArgumentLookupLessThanZeroTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupDependentTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupDependentTest.java index 2e5b06b87a..63041940f5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupDependentTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupDependentTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; @@ -26,6 +30,7 @@ import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; import jakarta.enterprise.invoke.InvokerBuilder; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -38,10 +43,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class InstanceLookupDependentTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupStaticMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupStaticMethodTest.java index 911c412f18..05268d1c88 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupStaticMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupStaticMethodTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; @@ -26,6 +30,7 @@ import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; import jakarta.enterprise.invoke.InvokerBuilder; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -38,10 +43,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class InstanceLookupStaticMethodTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupTest.java index 12a45d37b8..92bc4752ee 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/InstanceLookupTest.java @@ -15,6 +15,10 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import static org.testng.Assert.assertEquals; + +import java.util.Set; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; @@ -26,6 +30,7 @@ import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.invoke.Invoker; import jakarta.enterprise.invoke.InvokerBuilder; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.cdi.Sections; @@ -38,10 +43,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; - @SpecVersion(spec = "cdi", version = "4.1") public class InstanceLookupTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupAmbiguousTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupAmbiguousTest.java index cbd5c477a9..94a309de94 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupAmbiguousTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupAmbiguousTest.java @@ -15,6 +15,8 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,7 +25,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.inject.spi.DeploymentException; -import jakarta.inject.Singleton; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -37,8 +39,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - @SpecVersion(spec = "cdi", version = "4.1") public class LookupAmbiguousTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupUnsatisfiedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupUnsatisfiedTest.java index 654423b0f5..08b502fffe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupUnsatisfiedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/invokers/lookup/LookupUnsatisfiedTest.java @@ -15,6 +15,8 @@ */ package org.jboss.cdi.tck.tests.invokers.lookup; +import java.util.Set; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.build.compatible.spi.BeanInfo; import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; @@ -23,6 +25,7 @@ import jakarta.enterprise.inject.build.compatible.spi.Synthesis; import jakarta.enterprise.inject.build.compatible.spi.SyntheticComponents; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -36,8 +39,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - @SpecVersion(spec = "cdi", version = "4.1") public class LookupUnsatisfiedTest extends AbstractTest { @Deployment diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java index 386a8c9878..dad99815af 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/BindingAnnotationWithMemberTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Expensive.java index d016bde338..868c185885 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Expensive.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/SimpleAnnotation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/SimpleAnnotation.java index 82736f63b9..4a590f744d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/SimpleAnnotation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/SimpleAnnotation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/TheBeatles.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/TheBeatles.java index 4af59adc67..68701b3843 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/TheBeatles.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/TheBeatles.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Dependent public class TheBeatles { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Watch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Watch.java index 7b4858fe81..f5e6716993 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Watch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/annotation/Watch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Expensive(member = @SimpleAnnotation) @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java index f7d9562cd2..f975118a82 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/BindingAnnotationWithMemberTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Expensive.java index 0affbd783a..28e5e0c1ff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Expensive.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/TheBeatles.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/TheBeatles.java index b429f10eb5..b5ef57ce9d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/TheBeatles.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/TheBeatles.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Dependent public class TheBeatles { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Watch.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Watch.java index 4dcff5e337..2e361d8473 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Watch.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/binding/members/array/Watch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Expensive(prices = { "TWO" }) @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Animal.java index c1931ad79d..0463a6452a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.byname; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.byname; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Cod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Cod.java index c25e181f57..8bffe76036 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Cod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Cod.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Plaice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Plaice.java index 3e8d2f5186..9ae34e36bb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Plaice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Plaice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java index 32191e6c61..dd48d9f3fe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/ResolutionByNameTest.java @@ -41,7 +41,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = AMBIG_NAMES, id = "ca"), @SpecAssertion(section = BM_OBTAIN_BEAN_BY_NAME, id = "aa"), + @SpecAssertions({ @SpecAssertion(section = AMBIG_NAMES, id = "ca"), + @SpecAssertion(section = BM_OBTAIN_BEAN_BY_NAME, id = "aa"), @SpecAssertion(section = BM_OBTAIN_BEAN_BY_NAME, id = "b") }) public void testAmbiguousELNamesResolved() throws Exception { // Cod and Plaice are named "whitefish" - Cod is a not-enabled alternative diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Salmon.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Salmon.java index 498abb5795..1e6447d5f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Salmon.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Salmon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Sole.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Sole.java index 0bb0e83bf1..93e7523738 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Sole.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Sole.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Whitefish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Whitefish.java index 59b00e7056..80fceadd97 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Whitefish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/Whitefish.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.byname; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Whitefish { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.byname; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Whitefish { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Cod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Cod.java index fcf938c374..6c799ee4a1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Cod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Cod.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/DuplicitNameTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/DuplicitNameTest.java index f1f186506a..e75378b5e3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/DuplicitNameTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/DuplicitNameTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Sole.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Sole.java index 2d024cf007..36f42ecb3a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Sole.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/duplicity/Sole.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java index 6a7e4a9cd9..04fe4a595f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java index bdf83460aa..300bdcc002 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed/NamedNonFieldInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java index fff415d8a1..17f368df18 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java index 2fd57a1833..339f81c4dd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed2/NamedNonFieldInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/Foo.java index 2d8c8b7346..47501c69c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/NamedNonFieldInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/NamedNonFieldInjectionPointTest.java index a2e4f8dce0..11d9e20146 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/NamedNonFieldInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/injectionPointWithNamed3/NamedNonFieldInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/Example.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/Example.java index 6b86498ca3..ab8bbfdd43 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/Example.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/Example.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExampleWebsite_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExampleWebsite_Broken.java index b80242941c..157e8bea7e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExampleWebsite_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExampleWebsite_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefix2Test.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefix2Test.java index 51f5e3500c..0e0f074f10 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefix2Test.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefix2Test.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,8 @@ public class ExpandedNamePrefix2Test extends AbstractTest { @ShouldThrowException(DeploymentException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ExpandedNamePrefix2Test.class).withClasses(FooBar.class, FooBarBaz.class).build(); + return new WebArchiveBuilder().withTestClass(ExpandedNamePrefix2Test.class).withClasses(FooBar.class, FooBarBaz.class) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefixTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefixTest.java index e3214fed53..bc18f1f95e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefixTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/ExpandedNamePrefixTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,8 @@ public class ExpandedNamePrefixTest extends AbstractTest { @ShouldThrowException(DeploymentException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(ExpandedNamePrefixTest.class).withClasses(Foo.class, FooBarBaz.class).build(); + return new WebArchiveBuilder().withTestClass(ExpandedNamePrefixTest.class).withClasses(Foo.class, FooBarBaz.class) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/NamePrefixTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/NamePrefixTest.java index e5be329740..05c6f6ed3e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/NamePrefixTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/byname/broken/prefix/NamePrefixTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,8 @@ public class NamePrefixTest extends AbstractTest { @ShouldThrowException(DeploymentException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(NamePrefixTest.class).withClasses(Example.class, ExampleWebsite_Broken.class).build(); + return new WebArchiveBuilder().withTestClass(NamePrefixTest.class) + .withClasses(Example.class, ExampleWebsite_Broken.class).build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Air.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Air.java index d7d1919271..e38c19c35a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Air.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Air.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Bird.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Bird.java index 5cdf70a395..c5a02987bd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Bird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Bird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Car.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Car.java index 9739807c81..e2083fbf75 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Car.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Car.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/CircularDependencyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/CircularDependencyTest.java index 472ebeb297..3314032a78 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/CircularDependencyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/CircularDependencyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java index 70981be987..1197699fa8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/DependentSelfConsumingNormalProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Food.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Food.java index d79f81cf1c..adfdff4c8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Food.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Food.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/House.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/House.java index df108635b2..54f4e1a0fe 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/House.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/House.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java index 26248b6fc7..62e7cccae7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/NormalSelfConsumingNormalProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Petrol.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Petrol.java index cc5cab7da3..c510d365f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Petrol.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Petrol.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Pig.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Pig.java index a07400275c..25b5718c55 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Pig.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Pig.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Planet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Planet.java index 4c6bc5d821..ca65dc1f7f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Planet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Planet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingDependent1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingDependent1.java index eb0f454c77..974b0d8bbb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingDependent1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingDependent1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal.java index 80b3aa7995..1ef6775869 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal1.java index ea22468fa2..96913b9dc1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/SelfConsumingNormal1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Space.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Space.java index b5b1ea9b8c..a04a0a6fed 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Space.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Space.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Violation.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Violation.java index 748b49129d..6395d201bb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Violation.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/circular/Violation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/ClientProxyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/ClientProxyTest.java index af4d099947..805d63df62 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/ClientProxyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/ClientProxyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Fox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Fox.java index 9b56704fb7..ef09573b57 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Fox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Fox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Tuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Tuna.java index 062859b0d4..6ff8e84566 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Tuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/Tuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/TunedTuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/TunedTuna.java index 8d66c820fe..a1cb8fabec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/TunedTuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/TunedTuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayProducer.java index 2e26173b45..a7dac5c3b0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java index 62a039838e..6b74f32b89 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java index fcaa765928..5d81984346 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/array/InjectionPointBean_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.array; - -import jakarta.enterprise.context.Dependent; -import jakarta.inject.Inject; - -@Dependent -public class InjectionPointBean_Broken { - @Inject - String[] array; -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.array; + +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; + +@Dependent +public class InjectionPointBean_Broken { + @Inject + String[] array; +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/InjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/InjectionPointBean.java index c35038e837..19b62f68c2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/InjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/InjectionPointBean.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.beanConstructor; - -import jakarta.enterprise.context.Dependent; -import jakarta.inject.Inject; - -@Dependent -public class InjectionPointBean { - - @Inject - Unproxyable_Broken foo; -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.beanConstructor; + +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; + +@Dependent +public class InjectionPointBean { + + @Inject + Unproxyable_Broken foo; +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/Unproxyable_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/Unproxyable_Broken.java index d65925c7dc..3dc1d05a0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/Unproxyable_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/beanConstructor/Unproxyable_Broken.java @@ -1,27 +1,27 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.beanConstructor; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.inject.Inject; - -@RequestScoped -public class Unproxyable_Broken { - - @Inject - public Unproxyable_Broken(BeanManager beanManager) { - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.beanConstructor; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; + +@RequestScoped +public class Unproxyable_Broken { + + @Inject + public Unproxyable_Broken(BeanManager beanManager) { + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java index 44592d45e3..bd7c7f7f63 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FinalClassTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java index 5537dc72f7..1d9855451b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/Tuna_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/Tuna_Broken.java index 411f6c26bb..2d06b8777a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/Tuna_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalClass/Tuna_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpBroken.java index b16bf9d389..4dbce47a11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpBroken.java @@ -17,9 +17,9 @@ @RequestScoped public class CarpBroken { - - protected final void swim(){ + + protected final void swim() { } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpFarm.java index 3fb24eb21b..9e43c36975 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/CarpFarm.java @@ -18,8 +18,8 @@ @Dependent public class CarpFarm { - + @Inject CarpBroken carpBroken; - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ExtendedTuna_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ExtendedTuna_Broken.java index b120713081..87da51555b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ExtendedTuna_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ExtendedTuna_Broken.java @@ -1,20 +1,20 @@ -/* - * Copyright 2013, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.finalMethod; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class ExtendedTuna_Broken extends Tuna_Broken { +/* + * Copyright 2013, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.finalMethod; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class ExtendedTuna_Broken extends Tuna_Broken { } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java index 6eca528419..b7e5ebb9b0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PackagePrivateFinalMethodNotProxyableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PackagePrivateFinalMethodNotProxyableTest.java index f639746c3b..462c55fe31 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PackagePrivateFinalMethodNotProxyableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PackagePrivateFinalMethodNotProxyableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeBroken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeBroken.java index 9862081982..61a203256f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeBroken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeBroken.java @@ -17,9 +17,9 @@ @RequestScoped public class PikeBroken { - - final void swim(){ + + final void swim() { } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeFarm.java index 130289a68c..ac68e8ff7b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PikeFarm.java @@ -18,8 +18,8 @@ @Dependent public class PikeFarm { - + @Inject PikeBroken pikeBroken; - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PrivateFinalMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PrivateFinalMethodTest.java index 0e315011c3..19e1b70416 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PrivateFinalMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PrivateFinalMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,18 +27,19 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") public class PrivateFinalMethodTest extends AbstractTest { - + @Inject WhaleCovey whaleCovey; @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(PrivateFinalMethodTest.class).withClasses(Whale.class, WhaleCovey.class).build(); + return new WebArchiveBuilder().withTestClass(PrivateFinalMethodTest.class).withClasses(Whale.class, WhaleCovey.class) + .build(); } @Test diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ProtectedFinalMethodNotProxyableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ProtectedFinalMethodNotProxyableTest.java index 87f7d88fef..ad5876d0a2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ProtectedFinalMethodNotProxyableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/ProtectedFinalMethodNotProxyableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PublicFinalMethodNotProxyableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PublicFinalMethodNotProxyableTest.java index cae4366da6..976c182642 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PublicFinalMethodNotProxyableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/PublicFinalMethodNotProxyableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/StaticFinalMethodTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/StaticFinalMethodTest.java index 6480c78d3a..3996c0d6b1 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/StaticFinalMethodTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/StaticFinalMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,7 +26,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna.java index 35494bbbee..73f63688f9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna.java @@ -1,27 +1,27 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.finalMethod; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class Tuna { - - public static final String getFoo() { - return null; - } - - public void talk() { - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.finalMethod; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class Tuna { + + public static final String getFoo() { + return null; + } + + public void talk() { + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/TunaFarm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/TunaFarm.java index c2ca7f93e6..7bd61f15a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/TunaFarm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/TunaFarm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna_Broken.java index 3b0302df25..91082b2b41 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Tuna_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.finalMethod; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class Tuna_Broken { - public final String getFoo() { - return null; - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.finalMethod; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class Tuna_Broken { + public final String getFoo() { + return null; + } } \ No newline at end of file diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Whale.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Whale.java index d5c23fff8a..9c6c39ee9e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Whale.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/Whale.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/WhaleCovey.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/WhaleCovey.java index 3676935474..c038527338 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/WhaleCovey.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/finalMethod/WhaleCovey.java @@ -18,13 +18,12 @@ @Dependent public class WhaleCovey { - + @Inject Whale whale; - - - public void ping(){ + + public void ping() { whale.swim(); } - + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Fish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Fish.java index bb562342fd..0af3b6cfad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Fish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Fish.java @@ -13,6 +13,10 @@ */ package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.interceptor; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -20,10 +24,6 @@ import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/FishInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/FishInterceptor.java index 914d4a05ea..74989d0ecd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/FishInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/FishInterceptor.java @@ -23,13 +23,13 @@ @Priority(Interceptor.Priority.APPLICATION) public class FishInterceptor { - public FishInterceptor() { - } + public FishInterceptor() { + } - @AroundInvoke - public Object aroundInvoke(InvocationContext ic) throws Exception { + @AroundInvoke + public Object aroundInvoke(InvocationContext ic) throws Exception { - return ic.proceed(); - } + return ic.proceed(); + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java index 5b8ad58f14..15e4423a01 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/InterceptedBeanProxyTest.java @@ -16,12 +16,12 @@ import static org.jboss.cdi.tck.cdi.Sections.UNPROXYABLE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; @@ -29,19 +29,18 @@ @SpecVersion(spec = "cdi", version = "2.0") public class InterceptedBeanProxyTest extends AbstractTest { - - @Deployment - @ShouldThrowException(DeploymentException.class) - public static WebArchive createTestArchive() { - return new WebArchiveBuilder() - .withTestClassPackage(InterceptedBeanProxyTest.class) - .build(); - } + @Deployment + @ShouldThrowException(DeploymentException.class) + public static WebArchive createTestArchive() { + return new WebArchiveBuilder() + .withTestClassPackage(InterceptedBeanProxyTest.class) + .build(); + } - @Test - @SpecAssertions({ @SpecAssertion(section = UNPROXYABLE, id = "eb") }) - public void testClientProxyBeanWithBoundInterceptor() { - } + @Test + @SpecAssertions({ @SpecAssertion(section = UNPROXYABLE, id = "eb") }) + public void testClientProxyBeanWithBoundInterceptor() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/TestBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/TestBean.java index 6c9603d198..73a4bfcaf7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/TestBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/TestBean.java @@ -19,7 +19,7 @@ @Dependent public class TestBean { - @Inject - Tuna tuna; - + @Inject + Tuna tuna; + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Tuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Tuna.java index aac24a105b..5748c9bd60 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Tuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/interceptor/Tuna.java @@ -19,21 +19,21 @@ @Dependent public class Tuna { - public String name; - - private Tuna(){ - } - - public Tuna(String name){ - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - + public String name; + + private Tuna() { + } + + public Tuna(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/NumberProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/NumberProducer.java index 6ce70c5a39..9c75babac7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/NumberProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/NumberProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java index abe28d8b8e..5c1d6194d2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/Number_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java index a0b5146e07..9c437abeec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/primitive/UnproxyableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java index 4c7466058e..87cf5baa8f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.privateConstructor; - -import jakarta.enterprise.context.Dependent; -import jakarta.inject.Inject; - -@Dependent -public class InjectionPointBean { - @Inject - Unproxyable_Broken foo; -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.privateConstructor; + +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; + +@Dependent +public class InjectionPointBean { + @Inject + Unproxyable_Broken foo; +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java index b15e147285..5ea8455eac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/PrivateConstructorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/Unproxyable_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/Unproxyable_Broken.java index fddc249bff..5ba26fa96e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/Unproxyable_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/Unproxyable_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.privateConstructor; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class Unproxyable_Broken { - private Unproxyable_Broken() { - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.clientProxy.unproxyable.privateConstructor; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class Unproxyable_Broken { + private Unproxyable_Broken() { + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java index 37f81764c1..b9df6c30cf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/AmbiguousDependencyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -38,7 +38,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "ae"), @SpecAssertion(section = EXCEPTIONS, id = "c"), + @SpecAssertions({ @SpecAssertion(section = UNSATISFIED_AND_AMBIG_DEPENDENCIES, id = "ae"), + @SpecAssertion(section = EXCEPTIONS, id = "c"), @SpecAssertion(section = EXCEPTIONS, id = "ca") }) public void testAmbiguousDependency() { } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Animal.java index 9c88b139f4..053253421b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Cow.java index 8841e4b457..0b538411f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java index 276fd2bbf4..3d6acd2f8a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Farm_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Sheep.java index aaf876fa80..3a3dbbc10e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java index 9830b8f059..7885e294b5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Bean_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java index 3ed15dbc09..7c44f9f0ff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Small.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.dependency.resolution.broken.unsatisfied; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Qualifier -public @interface Small { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dependency.resolution.broken.unsatisfied; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Qualifier +public @interface Small { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java index 5afe7d33c5..c97b94eb12 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/UnsatisfiedDependencyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Vanilla.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Vanilla.java index dbe0c7804d..4b894a00f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Vanilla.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/unsatisfied/Vanilla.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.dependency.resolution.broken.unsatisfied; - -public class Vanilla { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dependency.resolution.broken.unsatisfied; + +public class Vanilla { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java index 870ec69da6..6703504d3a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AdvancedPaymentProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java index aa90eedc6a..6d2d266b63 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/AsynchronousPaymentProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 fb257ba6e1..9247442754 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 @@ -16,7 +16,6 @@ import static org.jboss.cdi.tck.cdi.Sections.ANNOTATIONLITERAL_TYPELITERAL; import static org.jboss.cdi.tck.cdi.Sections.BM_OBTAIN_INSTANCE; import static org.jboss.cdi.tck.cdi.Sections.DYNAMIC_LOOKUP; -import static org.jboss.cdi.tck.cdi.Sections.NEW; import static org.jboss.cdi.tck.cdi.Sections.PROGRAMMATIC_LOOKUP; import static org.jboss.cdi.tck.cdi.Sections.PROVIDER; import static org.testng.Assert.assertEquals; @@ -24,9 +23,7 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import java.util.stream.Stream; import jakarta.enterprise.inject.AmbiguousResolutionException; @@ -34,7 +31,6 @@ import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.UnsatisfiedResolutionException; import jakarta.enterprise.inject.spi.CDI; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -96,14 +92,16 @@ public void testNonBindingThrowsException() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROGRAMMATIC_LOOKUP, id = "ba"), @SpecAssertion(section = PROGRAMMATIC_LOOKUP, id = "ca"), + @SpecAssertions({ @SpecAssertion(section = PROGRAMMATIC_LOOKUP, id = "ba"), + @SpecAssertion(section = PROGRAMMATIC_LOOKUP, id = "ca"), @SpecAssertion(section = DYNAMIC_LOOKUP, id = "aa"), @SpecAssertion(section = DYNAMIC_LOOKUP, id = "ab"), @SpecAssertion(section = DYNAMIC_LOOKUP, id = "fa"), @SpecAssertion(section = DYNAMIC_LOOKUP, id = "fc") }) public void testGetMethod() { // initial setup of contextual instance getContextualReference(AdvancedPaymentProcessor.class, Any.Literal.INSTANCE).setValue(10); - Instance instance = getContextualReference(ObtainsInstanceBean.class).getPaymentProcessor(); + Instance instance = getContextualReference(ObtainsInstanceBean.class) + .getPaymentProcessor(); assertTrue(instance.get() instanceof AdvancedPaymentProcessor); assertEquals(instance.get().getValue(), 10); } @@ -165,8 +163,9 @@ public void testIteratorMethod() { assertNotNull(remote); assertEquals(remote.getValue(), 2); - Iterator iterator2 = instance.select(RemotePaymentProcessor.class, new PayByBinding(PayBy.PaymentMethod.CREDIT_CARD) { - }).iterator(); + Iterator iterator2 = instance + .select(RemotePaymentProcessor.class, new PayByBinding(PayBy.PaymentMethod.CREDIT_CARD) { + }).iterator(); assertEquals(iterator2.next().getValue(), 2); assertFalse(iterator2.hasNext()); @@ -195,7 +194,8 @@ public void testIsUnsatisfied() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROGRAMMATIC_LOOKUP, id = "da"), @SpecAssertion(section = DYNAMIC_LOOKUP, id = "la"), + @SpecAssertions({ @SpecAssertion(section = PROGRAMMATIC_LOOKUP, id = "da"), + @SpecAssertion(section = DYNAMIC_LOOKUP, id = "la"), @SpecAssertion(section = DYNAMIC_LOOKUP, id = "m") }) public void testIsAmbiguous() { ObtainsInstanceBean injectionPoint = getContextualReference(ObtainsInstanceBean.class); @@ -215,7 +215,8 @@ public void testStream(Instance uncommonInstance) { } @Test - @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_INSTANCE, id = "a"), @SpecAssertion(section = BM_OBTAIN_INSTANCE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_INSTANCE, id = "a"), + @SpecAssertion(section = BM_OBTAIN_INSTANCE, id = "b") }) public void beanManageCreateInstance() { Instance instance = getCurrentManager().createInstance(); Instance asyncProcessors = instance.select(AsynchronousPaymentProcessor.class); 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 558b8e5562..e15c8ba135 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 @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.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; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -public @interface NonBinding { - class Literal extends AnnotationLiteral implements NonBinding { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dynamic; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.util.AnnotationLiteral; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@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/ObtainsInstanceBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/ObtainsInstanceBean.java index d667118f97..cc8a4949ad 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/ObtainsInstanceBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/ObtainsInstanceBean.java @@ -1,47 +1,47 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.dynamic; - -import static org.jboss.cdi.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Any; -import jakarta.enterprise.inject.Instance; -import jakarta.inject.Inject; - -@Dependent -public class ObtainsInstanceBean { - @Inject - @PayBy(CHEQUE) - Instance paymentProcessor; - - @Inject - @Any - Instance anyPaymentProcessor; - - @Inject - Instance common; - - public Instance getPaymentProcessor() { - return paymentProcessor; - } - - public Instance getAnyPaymentProcessor() { - return anyPaymentProcessor; - } - - public Instance getCommon() { - return common; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dynamic; + +import static org.jboss.cdi.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + +@Dependent +public class ObtainsInstanceBean { + @Inject + @PayBy(CHEQUE) + Instance paymentProcessor; + + @Inject + @Any + Instance anyPaymentProcessor; + + @Inject + Instance common; + + public Instance getPaymentProcessor() { + return paymentProcessor; + } + + public Instance getAnyPaymentProcessor() { + return anyPaymentProcessor; + } + + public Instance getCommon() { + return common; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayBy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayBy.java index 1e7c40d51a..788c99ea1c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayBy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayBy.java @@ -1,38 +1,40 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.dynamic; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface PayBy { - public static enum PaymentMethod { - CASH, CHEQUE, CREDIT_CARD - }; - - PaymentMethod value(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dynamic; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface PayBy { + public static enum PaymentMethod { + CASH, + CHEQUE, + CREDIT_CARD + }; + + PaymentMethod value(); +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayByBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayByBinding.java index 2f2ba71cba..f616a21c85 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayByBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PayByBinding.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.dynamic; - -import jakarta.enterprise.util.AnnotationLiteral; - -abstract class PayByBinding extends AnnotationLiteral implements PayBy { - - PaymentMethod method; - - public PayByBinding(PaymentMethod method){ - this.method = method; - } - - public PaymentMethod value(){ - return method; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dynamic; + +import jakarta.enterprise.util.AnnotationLiteral; + +abstract class PayByBinding extends AnnotationLiteral implements PayBy { + + PaymentMethod method; + + public PayByBinding(PaymentMethod method) { + this.method = method; + } + + public PaymentMethod value() { + return method; + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PaymentProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PaymentProcessor.java index 76b2d39e3e..9463fb1304 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PaymentProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/PaymentProcessor.java @@ -1,17 +1,17 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.dynamic; - -public interface PaymentProcessor { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dynamic; + +public interface PaymentProcessor { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/RemotePaymentProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/RemotePaymentProcessor.java index 9bb9c09a69..2f795c770e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/RemotePaymentProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/RemotePaymentProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SimplePaymentProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SimplePaymentProcessor.java index 3d1721db40..152a6ceb18 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SimplePaymentProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SimplePaymentProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java index 1b2833a809..95b62c1807 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/SynchronousPaymentProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ConstructorInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ConstructorInjectionBar.java index a29a112bce..26cfbc0289 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ConstructorInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ConstructorInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class ConstructorInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/DisposerMethodInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/DisposerMethodInjectionBar.java index a492412ca3..ff3d657fff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/DisposerMethodInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/DisposerMethodInjectionBar.java @@ -21,7 +21,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class DisposerMethodInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/FieldInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/FieldInjectionBar.java index 65ec05727a..efa62f4c21 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/FieldInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/FieldInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class FieldInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/Foo.java index 5e878265ab..52e942107b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/Foo.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package org.jboss.cdi.tck.tests.lookup.dynamic.broken.raw; /** diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/InitMethodInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/InitMethodInjectionBar.java index 7b06778f27..bd34df9d60 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/InitMethodInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/InitMethodInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @SuppressWarnings("rawtypes") @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ObserverInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ObserverInjectionBar.java index 09ad244a6e..b4645858b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ObserverInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ObserverInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class ObserverInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ProducerMethodInjectionBar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ProducerMethodInjectionBar.java index a28ab64cdb..641db3d6cb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ProducerMethodInjectionBar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/ProducerMethodInjectionBar.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class ProducerMethodInjectionBar { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceConstructorInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceConstructorInjectionTest.java index aa2d26a24a..94e15bdc28 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceConstructorInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceConstructorInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawInstanceConstructorInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceDisposerInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceDisposerInjectionTest.java index 9f6ce09fa6..02c08ca3cd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceDisposerInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceDisposerInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawInstanceDisposerInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceFieldInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceFieldInjectionTest.java index ae334350d4..59b750a545 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceFieldInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceFieldInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawInstanceFieldInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceInitMethodInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceInitMethodInjectionTest.java index 03e90caf95..b88a35424e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceInitMethodInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceInitMethodInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawInstanceInitMethodInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceObserverInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceObserverInjectionTest.java index e638b85c1e..fd2b1f36da 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceObserverInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceObserverInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawInstanceObserverInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceProducerMethodInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceProducerMethodInjectionTest.java index dd884f39f8..801881a270 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceProducerMethodInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/broken/raw/RawInstanceProducerMethodInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class RawInstanceProducerMethodInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/AbstractAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/AbstractAnimal.java index eabfcb8fc7..4679de8d1c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/AbstractAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/AbstractAnimal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Animal.java index 0972965013..43171d5aaf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 e1d13c47e2..3c5eab7cae 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Cow.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Cow.java index d32dcaeaa4..fe53d5e5c2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Cow.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Farm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Farm.java index 2b86203e7b..8bb2b39eae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Farm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d79dc478dd..7dc68e08e8 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.dynamic.builtin; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface FarmBased { - class Literal extends AnnotationLiteral implements FarmBased { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.dynamic.builtin; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@Documented +@Qualifier +public @interface FarmBased { + class Literal extends AnnotationLiteral implements FarmBased { + } +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Field.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Field.java index f7c73cb645..83fa33b898 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Field.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/builtin/Field.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java index 980d1b1283..52ed8a2657 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/dependent/DestroyingDependentInstanceTest.java @@ -19,28 +19,28 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.util.ArrayList; +import java.util.List; + import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.List; - /** * Test for CDI-139. It verifies that Instance.destroy() can be used to destroy a dependent bean instance and bean instances * depending on the bean instance are destroyed as well. - * + * *

    * This test was originally part of the Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java index a385d4bce3..6156b0af96 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/destroy/normal/DestroyingNormalScopedInstanceTest.java @@ -17,7 +17,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.inject.Instance; @@ -45,70 +44,69 @@ @SpecVersion(spec = "cdi", version = "2.0") public class DestroyingNormalScopedInstanceTest extends AbstractTest { - private static final String[] VALUES = { "foo", "bar", "baz" }; + private static final String[] VALUES = { "foo", "bar", "baz" }; - @Deployment - public static WebArchive createTestArchive() { - return new WebArchiveBuilder() - .withTestClassPackage(DestroyingNormalScopedInstanceTest.class) - .build(); - } + @Deployment + public static WebArchive createTestArchive() { + return new WebArchiveBuilder() + .withTestClassPackage(DestroyingNormalScopedInstanceTest.class) + .build(); + } - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) - public void testApplicationScopedComponent( - Instance instance) { - testComponent(instance); - } + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) + @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) + public void testApplicationScopedComponent( + Instance instance) { + testComponent(instance); + } - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) - public void testRequestScopedComponent( - Instance instance) { - testComponent(instance); - } + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) + @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) + public void testRequestScopedComponent( + Instance instance) { + testComponent(instance); + } - /** - * TODO add assertion - OPEN ISSUE atm - * - * @param application - */ - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - public void testNothingHappensIfNoInstanceToDestroy( - ApplicationScopedComponent application) { - Bean bean = getUniqueBean(ApplicationScopedComponent.class); - AlterableContext context = (AlterableContext) getCurrentManager() - .getContext(bean.getScope()); + /** + * TODO add assertion - OPEN ISSUE atm + * + * @param application + */ + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) + public void testNothingHappensIfNoInstanceToDestroy( + ApplicationScopedComponent application) { + Bean bean = getUniqueBean(ApplicationScopedComponent.class); + AlterableContext context = (AlterableContext) getCurrentManager() + .getContext(bean.getScope()); - AbstractComponent.reset(); - application.setValue("value"); - context.destroy(bean); - assertTrue(AbstractComponent.isDestroyed()); + AbstractComponent.reset(); + application.setValue("value"); + context.destroy(bean); + assertTrue(AbstractComponent.isDestroyed()); - context.destroy(bean); - // Make sure subsequent calls do not raise exception - context.destroy(bean); - } + context.destroy(bean); + // Make sure subsequent calls do not raise exception + context.destroy(bean); + } - @Test(expectedExceptions = NullPointerException.class, dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) - public void testNullParameter(Instance instance) { - instance.destroy(null); - } + @Test(expectedExceptions = NullPointerException.class, dataProvider = ARQUILLIAN_DATA_PROVIDER) + @SpecAssertions({ @SpecAssertion(section = DYNAMIC_LOOKUP, id = "o") }) + public void testNullParameter(Instance instance) { + instance.destroy(null); + } + private void testComponent( + Instance instance) { + for (String string : VALUES) { + T reference = instance.get(); + assertNull(reference.getValue()); + reference.setValue(string); + assertEquals(reference.getValue(), string); - private void testComponent( - Instance instance) { - for (String string : VALUES) { - T reference = instance.get(); - assertNull(reference.getValue()); - reference.setValue(string); - assertEquals(reference.getValue(), string); - - AbstractComponent.reset(); - instance.destroy(reference); - assertTrue(AbstractComponent.isDestroyed()); - assertNull(reference.getValue(), reference.getValue()); - } - } + AbstractComponent.reset(); + instance.destroy(reference); + assertTrue(AbstractComponent.isDestroyed()); + assertNull(reference.getValue(), reference.getValue()); + } + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Alpha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Alpha.java index 5e78d8fde7..2d3495a3f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Alpha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Alpha.java @@ -13,12 +13,13 @@ */ package org.jboss.cdi.tck.tests.lookup.dynamic.handle; +import java.util.UUID; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; -import org.jboss.cdi.tck.util.ActionSequence; -import java.util.UUID; +import org.jboss.cdi.tck.util.ActionSequence; @Dependent public class Alpha { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Bravo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Bravo.java index 6936c42277..4e86f9e78a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Bravo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Bravo.java @@ -13,12 +13,13 @@ */ package org.jboss.cdi.tck.tests.lookup.dynamic.handle; +import java.util.UUID; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; -import org.jboss.cdi.tck.util.ActionSequence; -import java.util.UUID; +import org.jboss.cdi.tck.util.ActionSequence; @ApplicationScoped public class Bravo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Client.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Client.java index aeadeaa6fc..a4a16695a8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Client.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Client.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.tck.tests.lookup.dynamic.handle; +import java.math.BigDecimal; + import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; -import java.math.BigDecimal; - @Dependent public class Client { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/FirstProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/FirstProcessor.java index 330b78b493..6792c6504a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/FirstProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/FirstProcessor.java @@ -15,6 +15,7 @@ import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.ActionSequence; @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/InstanceHandleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/InstanceHandleTest.java index bd18f2e6d1..1d6f6bd309 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/InstanceHandleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/InstanceHandleTest.java @@ -21,10 +21,14 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import java.util.Iterator; +import java.util.List; + import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -34,9 +38,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Iterator; -import java.util.List; - @SpecVersion(spec = "cdi", version = "4.0") public class InstanceHandleTest extends AbstractTest { @@ -147,7 +148,7 @@ public void testHandles() { ActionSequence.reset(); assertTrue(instance.isAmbiguous()); - for (Iterator> iterator = instance.handles().iterator(); iterator.hasNext(); ) { + for (Iterator> iterator = instance.handles().iterator(); iterator.hasNext();) { try (Instance.Handle handle = iterator.next()) { handle.get().ping(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Juicy.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Juicy.java index 4a36ebe5ba..0bacca0aff 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Juicy.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/Juicy.java @@ -19,12 +19,12 @@ 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; import java.lang.annotation.Target; +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; + @Qualifier @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/SecondProcessor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/SecondProcessor.java index 12bb20dc2c..3a1dabd6cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/SecondProcessor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/dynamic/handle/SecondProcessor.java @@ -15,6 +15,7 @@ import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.ApplicationScoped; + import org.jboss.cdi.tck.util.ActionSequence; @ApplicationScoped diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Fox.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Fox.java index f01ed16cca..78759ae4d0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Fox.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Fox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderNest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderNest.java index e742ae77b2..52cc5d651f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderNest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderNest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderProducer.java index d1b29aca39..57274e373b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Wolf.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Wolf.java index 476d7f3d0e..82225295ac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Wolf.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/Wolf.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/WolfPack.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/WolfPack.java index c0619f7f40..dfc171fa45 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/WolfPack.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/WolfPack.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/AnyInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/AnyInjectionTest.java index d74bca96e9..14c62510f6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/AnyInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/AnyInjectionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Customer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Customer.java index 8f12c1c007..7882f69ec4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Customer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Customer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Drink.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Drink.java index 7ee674a19b..83fd762a39 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Drink.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/any/Drink.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerActualType.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerActualType.java index 6af3d3e6f7..94c5ede3ce 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerActualType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerActualType.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRaw.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRaw.java index 0b4a3d967c..4a2672bd4a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRaw.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRaw.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRawObject.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRawObject.java index b05973ef37..38422aff81 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRawObject.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerRawObject.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariable.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariable.java index bf1817a5a6..47d382c539 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariable.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariable.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariableUpperBound.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariableUpperBound.java index 9392b6be65..0d8547a28f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariableUpperBound.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ConsumerTypeVariableUpperBound.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/Dao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/Dao.java index c54847c291..12b7047679 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/Dao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/Dao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/DaoProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/DaoProducer.java index 183ace0ff6..3dfdbb4f25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/DaoProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/DaoProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerDao.java index 13ce0a6ce0..1c9733fcfb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerDao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerListOfStringsDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerListOfStringsDao.java index be9059d539..7eefc59bd8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerListOfStringsDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerListOfStringsDao.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.lookup.injection.parameterized; -import jakarta.enterprise.context.Dependent; - import java.util.List; +import jakarta.enterprise.context.Dependent; + @IntegerPowered @Dependent public class IntegerListOfStringsDao extends Dao> { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerPowered.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerPowered.java index 415ea236a1..63ff18ecbc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerPowered.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerPowered.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerStringDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerStringDao.java index 621fce5374..208d42091c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerStringDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/IntegerStringDao.java @@ -6,14 +6,13 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.lookup.injection.parameterized; - import jakarta.enterprise.context.Dependent; @IntegerPowered diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/NumberDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/NumberDao.java index 44463caf89..aa6cda81ea 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/NumberDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/NumberDao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectDao.java index 9208b6e900..c947402fa8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectDao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectPowered.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectPowered.java index d2b2f5b115..b6849f1800 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectPowered.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ObjectPowered.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithActualTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithActualTypeTest.java index 58a69dd5dc..1c50d9888b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithActualTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithActualTypeTest.java @@ -40,14 +40,16 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(ParameterizedTypesInjectionToParameterizedWithActualTypeTest.class) .withClasses(Dao.class, IntegerDao.class, IntegerStringDao.class, IntegerListOfStringsDao.class, - ConsumerActualType.class, IntegerPowered.class).build(); + ConsumerActualType.class, IntegerPowered.class) + .build(); } @Inject ConsumerActualType consumer; @Test - @SpecAssertions({ @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "ba"), @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "bb"), + @SpecAssertions({ @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "ba"), + @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "bb"), @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "e") }) public void testInjection() { assertNotNull(consumer.getDao()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableTest.java index 85a1483c8f..4df04fe8f0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableUpperBoundTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableUpperBoundTest.java index a2641af01f..5d73b48a63 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableUpperBoundTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithTypeVariableUpperBoundTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithWildcardTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithWildcardTest.java index c9556b02a7..9715b6f79f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithWildcardTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToParameterizedWithWildcardTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -40,14 +40,16 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(ParameterizedTypesInjectionToParameterizedWithWildcardTest.class) .withClasses(Dao.class, IntegerStringDao.class, StringDao.class, NumberDao.class, IntegerPowered.class, - ConsumerWildcard.class).build(); + ConsumerWildcard.class) + .build(); } @Inject ConsumerWildcard consumer; @Test - @SpecAssertions({ @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "c"), @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "da"), + @SpecAssertions({ @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "c"), + @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "da"), @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "db") }) public void testInjection() { assertNotNull(consumer.getDao()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToRawTypeTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToRawTypeTest.java index 9b627d82a4..003e82570f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToRawTypeTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/ParameterizedTypesInjectionToRawTypeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,7 +28,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -39,7 +39,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(ParameterizedTypesInjectionToRawTypeTest.class) .withClasses(Dao.class, DaoProducer.class, NumberDao.class, StringDao.class, ConsumerRaw.class, - ConsumerRawObject.class, ObjectPowered.class).build(); + ConsumerRawObject.class, ObjectPowered.class) + .build(); } @Inject diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/StringDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/StringDao.java index 7270c80d0a..42387957e3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/StringDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/StringDao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/broken/raw/ParameterizedTypesInjectionRawAmbiguousTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/broken/raw/ParameterizedTypesInjectionRawAmbiguousTest.java index 8bdc38c33e..2d6c8b84d9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/broken/raw/ParameterizedTypesInjectionRawAmbiguousTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/broken/raw/ParameterizedTypesInjectionRawAmbiguousTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BarFooQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BarFooQualifier.java index 04667f2b76..7095c571b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BarFooQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BarFooQualifier.java @@ -1,29 +1,29 @@ -/* - * Copyright 2014, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.injection.parameterized.multiple.bounds; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, FIELD }) -@Retention(RUNTIME) -@Qualifier -@interface BarFooQualifier { -} +/* + * Copyright 2014, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.injection.parameterized.multiple.bounds; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, FIELD }) +@Retention(RUNTIME) +@Qualifier +@interface BarFooQualifier { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BazQualifier.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BazQualifier.java index ea60ddb15f..8a5aee1873 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BazQualifier.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/parameterized/multiple/bounds/BazQualifier.java @@ -1,29 +1,29 @@ -/* - * Copyright 2014, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.injection.parameterized.multiple.bounds; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, FIELD }) -@Retention(RUNTIME) -@Qualifier -@interface BazQualifier { -} +/* + * Copyright 2014, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.injection.parameterized.multiple.bounds; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, FIELD }) +@Retention(RUNTIME) +@Qualifier +@interface BazQualifier { +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Animal.java index 6ff9009924..be7df9403c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Baz.java index 1c8f545078..3a95f9f21e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BazProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BazProducer.java index e7e107a7e2..b0382e8141 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BazProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BazProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java index 5722de1bb3..c20ab8aecd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/BeanWithInjectionPointMetadata.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,9 +20,9 @@ /** * Test bean with injection point on the constructor of the bean - * + * * @author David Allen - * + * */ @Dependent public class BeanWithInjectionPointMetadata { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java index 3c9f59c13d..c876db1673 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,9 +18,9 @@ /** * Test bean to inject a bean using injection point metadata into a constructor - * + * * @author David Allen - * + * */ @Dependent public class ConstructorInjectionPointBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java index 34c68c7451..31cbc4655b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/FieldInjectionPointBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * Test bean to inject another bean which uses injection point metadata in a field - * + * * @author David Allen - * + * */ @RequestScoped public class FieldInjectionPointBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Foo.java index 00f7b0b39b..89e39080a7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java index afb067999b..b429ddfc44 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/InjectionPointTest.java @@ -17,12 +17,19 @@ import static org.jboss.cdi.tck.cdi.Sections.INJECTION_POINT; import static org.testng.Assert.assertTrue; +import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Set; + import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.AnnotatedField; import jakarta.enterprise.inject.spi.AnnotatedParameter; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.InjectionPoint; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -32,12 +39,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.Set; - /** * Injection point metadata tests * @@ -55,7 +56,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = CONTEXTUAL_REFERENCE, id = "da"), @SpecAssertion(section = INJECTION_POINT, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = CONTEXTUAL_REFERENCE, id = "da"), + @SpecAssertion(section = INJECTION_POINT, id = "aa") }) public void testGetBean() { // Get an instance of the bean which has another bean injected into it diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java index c8ae44e212..de8c180977 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/MethodInjectionPointBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * Test bean to inject a bean using injection point metadata into a constructor - * + * * @author David Allen - * + * */ @Dependent public class MethodInjectionPointBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java index 41d40f7411..5c719196d5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/TransientFieldInjectionPointBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,9 +19,9 @@ /** * Test bean to inject another bean which uses injection point metadata in a field - * + * * @author David Allen - * + * */ @RequestScoped public class TransientFieldInjectionPointBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Disposer_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Disposer_Broken.java index ac71f756ae..8b099ad099 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Disposer_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Disposer_Broken.java @@ -30,5 +30,4 @@ public String produceGreeting() { public void disposeGreeting(@Disposes @Nice String greeting, InjectionPoint ip) { } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Nice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Nice.java index dd9500d749..be1b75d93f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Nice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/disposer/Nice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java index 970a0f0d30..018027bdef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/Cat_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java index 95230f8a85..877fa1a322 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/normal/scope/NormalScopedBeanWithInjectionPoint.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 0b4992ad8a..84f51c8b68 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 @@ -18,10 +18,8 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.Instance; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; - /** * @author Martin Kouba */ 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 b280bce06c..ca730a20c1 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 @@ -33,7 +33,6 @@ import jakarta.enterprise.inject.spi.Annotated; import jakarta.enterprise.inject.spi.AnnotatedField; import jakarta.enterprise.inject.spi.AnnotatedParameter; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -85,7 +84,8 @@ public void testInjectionPointGetQualifiers() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "caa"), @SpecAssertion(section = INJECTION_POINT, id = "cba"), + @SpecAssertions({ @SpecAssertion(section = INJECTION_POINT, id = "caa"), + @SpecAssertion(section = INJECTION_POINT, id = "cba"), @SpecAssertion(section = INJECTION_POINT, id = "cca") }) public void testInjectionPointGetMember() { @@ -118,7 +118,7 @@ public void testInjectionPointGetMember() { @SuppressWarnings("rawtypes") @Test - @SpecAssertion(section=INJECTION_POINT, id="dab") + @SpecAssertion(section = INJECTION_POINT, id = "dab") public void testInjectionPointGetAnnotated() { Annotated fooFieldAnnotated = bar.getFoo().getInjectionPoint().getAnnotated(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Foo.java index f1f1014227..151e969f9a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/Foo.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Foo { 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 96f8f24ca5..4c0e31f89d 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/NiceFoo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/NiceFoo.java index 9d5107558b..318acaa344 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/NiceFoo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/dynamic/NiceFoo.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @Nice @Dependent diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Animal.java index 92df917655..2721a8d866 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Animal.java @@ -1,20 +1,20 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.injectionpoint.named; - -public interface Animal { - - public Integer ping(); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.injectionpoint.named; + +public interface Animal { + + public Integer ping(); + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Carp.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Carp.java index c1ced9d214..6dbf2de87a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Carp.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/Carp.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/DaphniaProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/DaphniaProducer.java index 7de8c18ac2..a8ff615371 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/DaphniaProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/DaphniaProducer.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class DaphniaProducer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/FishingNet.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/FishingNet.java index 0460f02f08..e275e28bc5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/FishingNet.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/FishingNet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/NamedAtInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/NamedAtInjectionPointTest.java index 508730cac5..fe848fbea3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/NamedAtInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/named/NamedAtInjectionPointTest.java @@ -48,7 +48,8 @@ public static WebArchive createTestArchive() { Pike pike; @Test - @SpecAssertions({ @SpecAssertion(section = NAMED_AT_INJECTION_POINT, id = "a"), @SpecAssertion(section = DEFAULT_NAME, id = "fa") }) + @SpecAssertions({ @SpecAssertion(section = NAMED_AT_INJECTION_POINT, id = "a"), + @SpecAssertion(section = DEFAULT_NAME, id = "fa") }) public void testFieldNameUsedAsBeanName() { // Managed bean assertNotNull(fishingNet); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Conifer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Conifer.java index 71e3520d1a..66c3e87f27 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Conifer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Conifer.java @@ -15,6 +15,7 @@ package org.jboss.cdi.tck.tests.lookup.injectionpoint.requiredtype; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.SimpleLogger; /** diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Leaf.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Leaf.java index d66639cdc6..eff9857a62 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Leaf.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/requiredtype/Leaf.java @@ -15,11 +15,12 @@ package org.jboss.cdi.tck.tests.lookup.injectionpoint.requiredtype; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.SimpleLogger; /** * @author Martin Kouba - * + * */ @Dependent public class Leaf { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/FishFarmOffice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/FishFarmOffice.java index dae5e2778f..448ced745d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/FishFarmOffice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/FishFarmOffice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/ManagerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/ManagerTest.java index c34ea79d2a..ab4aaf99b6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/ManagerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/ManagerTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -68,10 +68,12 @@ public void testManagerBeanHasCurrentBinding() { } @Test - @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_CONTEXTUAL_REFERENCE, id = "a"), @SpecAssertion(section = BM_OBTAIN_CONTEXTUAL_REFERENCE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = BM_OBTAIN_CONTEXTUAL_REFERENCE, id = "a"), + @SpecAssertion(section = BM_OBTAIN_CONTEXTUAL_REFERENCE, id = "b") }) public void testGetReferenceReturnsContextualInstance() { Bean bean = getBeans(FishFarmOffice.class).iterator().next(); - assert getCurrentManager().getReference(bean, FishFarmOffice.class, getCurrentManager().createCreationalContext(bean)) instanceof FishFarmOffice; + assert getCurrentManager().getReference(bean, FishFarmOffice.class, + getCurrentManager().createCreationalContext(bean)) instanceof FishFarmOffice; } @Test(expectedExceptions = { IllegalArgumentException.class }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/African.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/African.java index 4c27409764..821c1b5db0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/African.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/African.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Animal.java index d6fea468a2..d9a45ac3ca 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +public interface Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java index e9b45c3c76..8ca6c1d64a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Australian.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Australian.java index 1adef333ec..6de691398d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Australian.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Australian.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Bird.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Bird.java index 40191dc234..945e482393 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Bird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Bird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Canary.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Canary.java index 056ec0b217..cab4962e49 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Canary.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Canary.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cat.java index ec43f1b378..77e1fb24eb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Chunky.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Chunky.java index 540c705222..9e17ace2c4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Chunky.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Chunky.java @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Chunky { - - boolean realChunky(); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Chunky { + + boolean realChunky(); + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java index f72cf79a83..18c2c49f11 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cod.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cod.java index 9336d0018d..021a553a41 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cod.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Cod.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java index 3c07c2f75a..6f0cee5a92 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DaddyLongLegs.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Alternative; - -@Alternative -@Dependent -public class DaddyLongLegs extends Spider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; + +@Alternative +@Dependent +public class DaddyLongLegs extends Spider { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlyAnimal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlyAnimal.java index 6b58f678bd..e40d5ac27d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlyAnimal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlyAnimal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -public interface DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +public interface DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlySpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlySpider.java index 7140ea14e1..b8f11cb622 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlySpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DeadlySpider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -public interface DeadlySpider extends DeadlyAnimal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +public interface DeadlySpider extends DeadlyAnimal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DomesticCat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DomesticCat.java index ec6742a8e9..68c636e8a3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DomesticCat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/DomesticCat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Dove.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Dove.java index b2502d277f..bd04ce6864 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Dove.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Dove.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Emu.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Emu.java index ea05fa4773..0c4cea7d34 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Emu.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Emu.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/European.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/European.java index b9c4bce9fb..a949612ca6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/European.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/European.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Expensive.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Expensive.java index fbce0cd75a..12c546791b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Expensive.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Expensive.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java index 6cfafb2220..585c205cc9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Farmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Farmer.java index 3ea41402bc..8832c9b044 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Farmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Farmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/FlightlessBird.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/FlightlessBird.java index f3baef56fb..e34ce01d25 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/FlightlessBird.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/FlightlessBird.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Halibut.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Halibut.java index 0be5b35fc1..5309232336 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Halibut.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Halibut.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java index 4e30d4f417..0e50921c12 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/LadybirdSpider.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class LadybirdSpider extends Spider { - - public void spinWeb() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class LadybirdSpider extends Spider { + + public void spinWeb() { + + } + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Lion.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Lion.java index dca1949c5c..f48d6111c5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Lion.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Lion.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 5f623d3eb8..b497cd8d8e 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 0b84a7d16d..7957f72c6d 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d51243ac6b..fe6e1fabab 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/NumberProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/NumberProducer.java index d06ab589f6..614b47d30f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/NumberProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/NumberProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Parrot.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Parrot.java index 7059d75088..a9fa1c8cd5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Parrot.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Parrot.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/PetShop.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/PetShop.java index 15c1fe0d28..b52d24865a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/PetShop.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/PetShop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Plaice.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Plaice.java index 7b80f704e6..078032d956 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Plaice.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Plaice.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 56efbe6f96..f6331924b5 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 @@ -30,9 +30,10 @@ import java.lang.reflect.Type; import java.util.HashSet; import java.util.Set; + import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.TypeLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -72,8 +73,10 @@ public void testDefaultBindingTypeAssumed() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTED_FIELD_QUALIFIERS, id = "b"), @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "lc"), - @SpecAssertion(section = DECLARING_BEAN_QUALIFIERS, id = "d"), @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "la"), + @SpecAssertions({ @SpecAssertion(section = INJECTED_FIELD_QUALIFIERS, id = "b"), + @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "lc"), + @SpecAssertion(section = DECLARING_BEAN_QUALIFIERS, id = "d"), + @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "la"), @SpecAssertion(section = MULTIPLE_QUALIFIERS, id = "a"), @SpecAssertion(section = MULTIPLE_QUALIFIERS, id = "d") }) public void testAllQualifiersSpecifiedForResolutionMustAppearOnBean() { @@ -102,14 +105,17 @@ public void testResolveByTypeWithTypeParameter() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "j"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "i") }) + @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "j"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "i") }) public void testResolveByTypeWithArray() throws Exception { assertEquals(getBeans(Spider[].class).size(), 1); } @Test - @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "i"), @SpecAssertion(section = PRIMITIVE_TYPES_AND_NULL_VALUES, id = "aa"), - @SpecAssertion(section = PRIMITIVE_TYPES_AND_NULL_VALUES, id = "ab"), @SpecAssertion(section = MULTIPLE_QUALIFIERS, id = "b"), + @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "i"), + @SpecAssertion(section = PRIMITIVE_TYPES_AND_NULL_VALUES, id = "aa"), + @SpecAssertion(section = PRIMITIVE_TYPES_AND_NULL_VALUES, id = "ab"), + @SpecAssertion(section = MULTIPLE_QUALIFIERS, id = "b"), @SpecAssertion(section = MULTIPLE_QUALIFIERS, id = "c"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "j") }) public void testResolveByTypeWithPrimitives() { @@ -124,7 +130,8 @@ public void testResolveByTypeWithPrimitives() { } @Test - @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "ld"), @SpecAssertion(section = QUALIFIER_ANNOTATION_MEMBERS, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "ld"), + @SpecAssertion(section = QUALIFIER_ANNOTATION_MEMBERS, id = "b") }) public void testResolveByTypeWithNonBindingMembers() throws Exception { Set> beans = getBeans(Animal.class, new ExpensiveLiteral() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java index 6e98658a38..67ca44544c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/RoundWhitefish.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFish.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFish.java index 86196e452e..9190972375 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFish.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFish.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -public interface ScottishFish extends Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +public interface ScottishFish extends Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java index 2a53821140..1b26bad5e5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Sole.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Sole.java index bde2be3483..ef664d2876 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Sole.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Sole.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Spider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Spider.java index 1458f2d979..44cea96948 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Spider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Spider.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -public class Spider implements Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +public class Spider implements Animal { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/SpiderProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/SpiderProducer.java index 96bcb59268..a797030aaf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/SpiderProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/SpiderProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 2fe62b3390..b1e3901337 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tarantula.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tarantula.java index 36cee527f8..f4419d50a0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tarantula.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tarantula.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -public class Tarantula extends Spider implements DeadlySpider { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +public class Tarantula extends Spider implements DeadlySpider { + +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tuna.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tuna.java index 210167c828..dc9039a796 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tuna.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/Tuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 ac3e1d6c80..e1a5c03cc2 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Whitefish { - class Literal extends AnnotationLiteral implements Whitefish { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.typesafe.resolution; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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 865963cdba..9a5307d2bb 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/CrabSpider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/CrabSpider.java index 0dea5935d5..a408a08651 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/CrabSpider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/CrabSpider.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/DisabledBeanNotAvailableForInjectionTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/DisabledBeanNotAvailableForInjectionTest.java index fe5851fe72..969a88c55b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/DisabledBeanNotAvailableForInjectionTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/DisabledBeanNotAvailableForInjectionTest.java @@ -29,7 +29,7 @@ /** * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class DisabledBeanNotAvailableForInjectionTest extends AbstractTest { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/Sea.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/Sea.java index 71a350b136..8d845f2225 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/Sea.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/disabled/Sea.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Sea { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Animal.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Animal.java index ff7dc85131..460cf0154b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Animal.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java index 19dad623b2..160d31f6fd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Sheep.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Sheep.java index 497f978281..1818862d8d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Sheep.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java index 305b0dcc70..e2f25b6955 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/broken/type/variable/TypeVariableInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java index 08f4512622..c5bff3adf9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java index 0e6229ce56..c005413e16 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java index 833fcdb1bd..b77b5780ae 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/CatInterceptorBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Foo.java index ed0591497f..7f463b1e0d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/Foo.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Foo { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedInterModuleTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedInterModuleTest.java index 47e8bc7c37..0f9ab12ab7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedInterModuleTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedInterModuleTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -35,9 +35,9 @@ public class InterceptorNotResolvedInterModuleTest extends AbstractTest { *
  • A - WEB-INF/classes BDA: Foo
    • *
  • B - WEB-INF/lib BDA: Cat, CatInterceptor, CatInterceptorBinding
    • * - * + * * Interceptor is not enabled in any BDA. - * + * * @return test archive */ @ShouldThrowException(DeploymentException.class) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java index c4bc5e0b40..14268c29c4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/InterceptorNotResolvedTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,9 +22,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java index 89b5490e35..82e1742d2b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java @@ -55,7 +55,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "kb"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "f"), + @SpecAssertions({ @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "kb"), + @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "f"), @SpecAssertion(section = LEGAL_BEAN_TYPES, id = "g"), @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "a") }) public void testAssignabilityToRawType() { // Dao, DaoProducer.getDao(), DaoProducer.getRawDao and ObjectDao @@ -91,8 +92,9 @@ public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTy @SpecAssertions({ @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "da"), @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "dc") }) public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards() { - Set>> beans = getBeans(new TypeLiteral>() { - }); + Set>> beans = getBeans( + new TypeLiteral>() { + }); assert beans.size() == 1; assert rawTypeSetMatches(beans.iterator().next().getTypes(), RESULT_TYPES); } @@ -101,22 +103,19 @@ public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterized @SpecAssertions({ @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "db"), @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "dc") }) public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards2() { - Set>> beans = getBeans(new TypeLiteral>() { - }); + Set>> beans = getBeans( + new TypeLiteral>() { + }); assert beans.size() == 1; assert rawTypeSetMatches(beans.iterator().next().getTypes(), RESULT_TYPES); } @Test @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "dc") - public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcardWithLowerBound() { - Set>> beans = getBeans(new TypeLiteral>() { - }); + public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcardWithLowerBound() { + Set>> beans = getBeans( + new TypeLiteral>() { + }); assertEquals(beans.size(), 0); Set>> beans1 = getBeans(new TypeLiteral>() { @@ -153,13 +152,15 @@ T6 extends BarBazSuperFooImpl & SuperBarFooCloneable> void testAssignabilityOfPa @Test @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "e") public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithActualTypes() { - Set>> beans = getBeans(new TypeLiteral>() { - }); + Set>> beans = getBeans( + new TypeLiteral>() { + }); assert beans.size() == 1; assert rawTypeSetMatches(beans.iterator().next().getTypes(), RESULT_TYPES); - Set>> noBeans = getBeans(new TypeLiteral>() { - }); + Set>> noBeans = getBeans( + new TypeLiteral>() { + }); assertEquals(noBeans.size(), 0); } @@ -202,12 +203,7 @@ public void testAssignabilityOf @Test @SpecAssertion(section = ASSIGNABLE_PARAMETERS, id = "f") - public void testAssignabilityOfParameterizedTypeWithTypeVariableWithMultipleBoundsToParameterizedTypeWithTypeVariable() { + public void testAssignabilityOfParameterizedTypeWithTypeVariableWithMultipleBoundsToParameterizedTypeWithTypeVariable() { Set>> beans1 = getBeans(new TypeLiteral>() { }); assertEquals(beans1.size(), 1); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/Dao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/Dao.java index f1386ac596..4e52f951d8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/Dao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/Dao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java index c1bb6bd76f..f42dba2694 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Dependent public class DaoProducer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java index f8025a86b1..29eea97128 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/InjectedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerDao.java index 42d64eee41..829fef6a4b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerDao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerHashMap.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerHashMap.java index 343a924c51..23a65026b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerHashMap.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/IntegerHashMap.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.lookup.typesafe.resolution.parameterized; -import jakarta.enterprise.context.Dependent; - import java.util.HashMap; +import jakarta.enterprise.context.Dependent; + @Dependent public class IntegerHashMap extends HashMap { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java index ba118234da..31519fa106 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,7 +21,7 @@ /** * @author pmuir - * + * */ @Dependent public class MapProducer { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/ObjectDao.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/ObjectDao.java index e41e4b59e7..4aac52d150 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/ObjectDao.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/ObjectDao.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/raw/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/raw/Foo.java index 0b8543947f..9c6a95e30a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/raw/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/parameterized/raw/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/Game.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/Game.java index 63647e378a..7b0b0449ef 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/Game.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/Game.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveInjectionPointTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveInjectionPointTest.java index 647f9eac38..1ae991f4bf 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveInjectionPointTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveInjectionPointTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import static org.testng.Assert.assertTrue; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -30,7 +31,7 @@ * Test varios types of injection points of primitive types that resolve to a producer method or producer field that returns a * null value at runtime. The container must inject the primitive type's default value as defined by the JSL 4.12.5 * "Initial Values of Variables". - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveProducer.java index 554ef33ec0..a72c6a0eb0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/primitive/PrimitiveProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/AlternativeStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/AlternativeStereotype.java index 92b573e9f2..5adcc9ebdd 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/AlternativeStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/AlternativeStereotype.java @@ -20,6 +20,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.enterprise.inject.Alternative; import jakarta.enterprise.inject.Stereotype; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding1.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding1.java index 39cd5f0dbc..03fde8b226 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding1.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding2.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding2.java index c196d9797e..b0792ea48c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding2.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BarInterceptorBinding2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import jakarta.interceptor.InterceptorBinding; @Target({ TYPE, METHOD }) diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Baz.java index ca0a4d6f93..66c0ed7686 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Baz.java @@ -22,7 +22,7 @@ public class Baz { @Inject Qux qux; - public Qux ping(){ + public Qux ping() { return qux; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BootstrapSEContainerTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BootstrapSEContainerTest.java index ca2671b9bc..d1b901db90 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BootstrapSEContainerTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/BootstrapSEContainerTest.java @@ -64,7 +64,8 @@ public static Archive deployment() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "a"), @SpecAssertion(section = SE_BOOTSTRAP, id = "a"), + @SpecAssertions({ @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "a"), + @SpecAssertion(section = SE_BOOTSTRAP, id = "a"), @SpecAssertion(section = SE_BOOTSTRAP, id = "c"), @SpecAssertion(section = SE_BOOTSTRAP, id = "do"), @SpecAssertion(section = SE_CONTAINER, id = "cb") }) @@ -87,7 +88,8 @@ public void testContainerCloseMethodOnNotInitializedContainer() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "a"), @SpecAssertion(section = SE_BOOTSTRAP, id = "c"), + @SpecAssertions({ @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "a"), + @SpecAssertion(section = SE_BOOTSTRAP, id = "c"), @SpecAssertion(section = SE_BOOTSTRAP, id = "da"), @SpecAssertion(section = SE_BOOTSTRAP, id = "do"), @SpecAssertion(section = SE_BOOTSTRAP, id = "e") }) @@ -108,7 +110,8 @@ public void testInvocationOfInitializedMethodReturnsNewSeContainerInstance() { @SpecAssertion(section = SE_CONTAINER, id = "a"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) public void testSyntheticArchive() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); - try (SeContainer seContainer = seContainerInitializer.disableDiscovery().addBeanClasses(Baz.class, Qux.class, BazObserver.class).initialize()) { + try (SeContainer seContainer = seContainerInitializer.disableDiscovery() + .addBeanClasses(Baz.class, Qux.class, BazObserver.class).initialize()) { BeanManager beanManager = seContainer.getBeanManager(); beanManager.getEvent().select(Baz.class, Any.Literal.INSTANCE).fire(new Baz()); beanManager.getEvent().select(Qux.class, Any.Literal.INSTANCE).fire(new Qux()); @@ -120,7 +123,8 @@ public void testSyntheticArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "a"), @SpecAssertion(section = SE_BOOTSTRAP, id = "db"), + @SpecAssertions({ @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "a"), + @SpecAssertion(section = SE_BOOTSTRAP, id = "db"), @SpecAssertion(section = SE_BOOTSTRAP, id = "dh"), @SpecAssertion(section = SE_BOOTSTRAP, id = "di"), @SpecAssertion(section = SE_BOOTSTRAP, id = "dm"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) @@ -141,7 +145,8 @@ public void testAlternativesInSE() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "dc"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "dc"), + @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) public void testAddPackageNotRecursively() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); try (SeContainer seContainer = seContainerInitializer.disableDiscovery() @@ -156,7 +161,8 @@ public void testAddPackageNotRecursively() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "dc"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "dc"), + @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) public void testAddPackageRecursively() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); try (SeContainer seContainer = seContainerInitializer.disableDiscovery() @@ -171,7 +177,8 @@ public void testAddPackageRecursively() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "de"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "de"), + @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) public void testAddExtensionAsExtensionInstance() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); TestExtension testExtension = new TestExtension(); @@ -192,7 +199,8 @@ public void testAddExtensionAsExtensionInstance() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "de"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "de"), + @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) public void testAddExtensionAsClass() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); try (SeContainer seContainer = seContainerInitializer.disableDiscovery() @@ -212,7 +220,8 @@ public void testAddExtensionAsClass() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "df"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "df"), + @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) public void testAddInterceptor() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); try (SeContainer seContainer = seContainerInitializer.disableDiscovery() @@ -229,7 +238,8 @@ public void testAddInterceptor() { } @Test - @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "dg"), @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = SE_BOOTSTRAP, id = "dg"), + @SpecAssertion(section = SE_CONTAINER_INITIALIZER, id = "b") }) public void testAddDecorator() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); try (SeContainer seContainer = seContainerInitializer.disableDiscovery() diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Foo.java index 42c4c9b532..15d8530392 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Foo.java @@ -17,8 +17,8 @@ @Dependent public class Foo { - - public void ping(){ + + public void ping() { } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/FooProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/FooProducer.java index dadbca6e3b..eecdfb651d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/FooProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/FooProducer.java @@ -21,7 +21,7 @@ public class FooProducer { @AlternativeStereotype @Produces @Named - public Foo createFoo(){ + public Foo createFoo() { return new Foo(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Garply.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Garply.java index 73ba4c547b..47c8393343 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Garply.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/Garply.java @@ -20,11 +20,11 @@ public class Garply { private final int number; - public Garply(){ + public Garply() { number = 0; } - public Garply(int number){ + public Garply(int number) { this.number = number; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/GarplyProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/GarplyProducer.java index 56ab3f6b2f..25fabe03cc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/GarplyProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/GarplyProducer.java @@ -21,7 +21,7 @@ public class GarplyProducer { @Produces @Custom - public Garply createGarply(){ + public Garply createGarply() { return new Garply(1); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/TestExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/TestExtension.java index 1e3d5ebfc8..129ba6bd48 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/TestExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/TestExtension.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.se.container; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.AfterBeanDiscovery; import jakarta.enterprise.inject.spi.AfterDeploymentValidation; @@ -37,7 +38,6 @@ public class TestExtension implements Extension { private AtomicBoolean pbNotified = new AtomicBoolean(); private AtomicBoolean pbaNotified = new AtomicBoolean(); - void observeBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager) { bbdNotified.set(true); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/FooBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/FooBean.java index c453f6e543..4c742222c7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/FooBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/FooBean.java @@ -15,7 +15,8 @@ import jakarta.enterprise.context.ApplicationScoped; -/** Normal scoped bean +/** + * Normal scoped bean * * @author Matej Novotny */ diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/InvalidContextualReferenceTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/InvalidContextualReferenceTest.java index bfb3239a00..0098490425 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/InvalidContextualReferenceTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/contextualReference/InvalidContextualReferenceTest.java @@ -38,7 +38,7 @@ @Test(groups = SE) @SpecVersion(spec = "cdi", version = "2.0") public class InvalidContextualReferenceTest extends Arquillian { - + @Deployment public static Archive deployment() { final JavaArchive testArchive = ShrinkWrap.create(JavaArchive.class) @@ -47,7 +47,7 @@ public static Archive deployment() { "META-INF/beans.xml"); return ClassPath.builder().add(testArchive).build(); } - + @Test(expectedExceptions = IllegalStateException.class) @SpecAssertions(@SpecAssertion(section = CONTEXTUAL_REFERENCE_VALIDITY, id = "b")) public void testReferenceUsedAfterContainerShutdown() { @@ -59,7 +59,7 @@ public void testReferenceUsedAfterContainerShutdown() { validBeanReference.ping(); beanReferenceOutsideContainer = validBeanReference; } - + // now use stored reference after container shutdown // this should throw IllegalStateException beanReferenceOutsideContainer.ping(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/AlphaExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/AlphaExtension.java index e40d5e15aa..4c78ecfb82 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/AlphaExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/AlphaExtension.java @@ -19,7 +19,7 @@ public class AlphaExtension implements Extension, MyExtension { - public void processAnnotatedType(@Observes ProcessAnnotatedType event){ + public void processAnnotatedType(@Observes ProcessAnnotatedType event) { event.configureAnnotatedType().add(ProcessedByExtension.ProcessedByExtensionLiteral.INSTANCE); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/BravoExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/BravoExtension.java index 4c751833a1..2b88cdaa6d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/BravoExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/BravoExtension.java @@ -19,8 +19,8 @@ public class BravoExtension implements Extension { - public void processAnnotatedType(@Observes ProcessAnnotatedType event){ - event.configureAnnotatedType().add(ProcessedByExtension.ProcessedByExtensionLiteral.INSTANCE); + public void processAnnotatedType(@Observes ProcessAnnotatedType event) { + event.configureAnnotatedType().add(ProcessedByExtension.ProcessedByExtensionLiteral.INSTANCE); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/CustomClassLoaderSETest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/CustomClassLoaderSETest.java index aea895ca4e..466199d2f7 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/CustomClassLoaderSETest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/CustomClassLoaderSETest.java @@ -20,6 +20,7 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Enumeration; + import jakarta.enterprise.inject.se.SeContainer; import jakarta.enterprise.inject.se.SeContainerInitializer; import jakarta.enterprise.inject.spi.Extension; @@ -47,7 +48,8 @@ public class CustomClassLoaderSETest extends Arquillian { public static Archive deployment() throws IOException { final JavaArchive bda1 = ShrinkWrap.create(JavaArchive.class) .addPackage(CustomClassLoaderSETest.class.getPackage()) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml").addAsServiceProvider(Extension.class, AlphaExtension.class, BravoExtension.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsServiceProvider(Extension.class, AlphaExtension.class, BravoExtension.class) .addAsServiceProvider(MyExtension.class, AlphaExtension.class); return ClassPath.builder().add(bda1).build(); } @@ -72,7 +74,8 @@ public Enumeration getResources(String name) throws IOException { .setClassLoader(classLoader) .initialize()) { container.select(Alpha.class, ProcessedByExtension.ProcessedByExtensionLiteral.INSTANCE).get().ping(); - Assert.assertTrue(container.select(Bravo.class, ProcessedByExtension.ProcessedByExtensionLiteral.INSTANCE).isUnsatisfied()); + Assert.assertTrue( + container.select(Bravo.class, ProcessedByExtension.ProcessedByExtensionLiteral.INSTANCE).isUnsatisfied()); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/ProcessedByExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/ProcessedByExtension.java index 8dee49bc0e..7c4363413e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/ProcessedByExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/customClassloader/ProcessedByExtension.java @@ -17,6 +17,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Qualifier; @@ -25,7 +26,8 @@ @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER }) public @interface ProcessedByExtension { - public static class ProcessedByExtensionLiteral extends AnnotationLiteral implements ProcessedByExtension { + public static class ProcessedByExtensionLiteral extends AnnotationLiteral + implements ProcessedByExtension { public static ProcessedByExtensionLiteral INSTANCE = new ProcessedByExtensionLiteral(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/testPackage/Apple.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/testPackage/Apple.java index 9c534221b5..6230708d7a 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/testPackage/Apple.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/container/testPackage/Apple.java @@ -10,7 +10,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - */package org.jboss.cdi.tck.tests.se.container.testPackage; + */ +package org.jboss.cdi.tck.tests.se.container.testPackage; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ApplicationScopedObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ApplicationScopedObserver.java index ebf0923481..4adec449af 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ApplicationScopedObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ApplicationScopedObserver.java @@ -35,7 +35,7 @@ public void observesApplicationScopedIsInitialized(@Observes @Initialized(Applic initializedEventPayload = obj; } - public void observesApplicationScopedBeforeDestroyed(@Observes @BeforeDestroyed(ApplicationScoped.class) Object obj){ + public void observesApplicationScopedBeforeDestroyed(@Observes @BeforeDestroyed(ApplicationScoped.class) Object obj) { isBeforeDestroyed = true; beforeDestroyedEventPayload = obj; } @@ -44,8 +44,8 @@ public void observesApplicationScopedIsDestroyed(@Observes @Destroyed(Applicatio isDestroyed = true; destroyedEventPayload = obj; } - - public static void reset(){ + + public static void reset() { isInitialized = false; isBeforeDestroyed = false; isDestroyed = false; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Bar.java index 0e019d779e..0ce66a1b50 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Bar.java @@ -22,7 +22,7 @@ public class Bar { @Inject ApplicationScopedCounter counter; - public void ping(){ + public void ping() { counter.increment(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Baz.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Baz.java index 7a19448efd..1180d9a87f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Baz.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Baz.java @@ -22,7 +22,7 @@ public class Baz { @Inject ApplicationScopedCounter counter; - public void ping(){ + public void ping() { counter.increment(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ContextSETest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ContextSETest.java index c49fc78eee..92351ee22b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ContextSETest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/ContextSETest.java @@ -43,9 +43,12 @@ public static Archive deployment() { final JavaArchive testArchive = ShrinkWrap.create(JavaArchive.class) .addClasses(ContextSETest.class, ApplicationScopedCounter.class, ApplicationScopedObserver.class) .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); - final JavaArchive fooArchive = ShrinkWrap.create(JavaArchive.class).addClasses(Foo.class).addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); - final JavaArchive barArchive = ShrinkWrap.create(JavaArchive.class).addClasses(Bar.class).addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); - final JavaArchive bazArchive = ShrinkWrap.create(JavaArchive.class).addClasses(Baz.class).addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); + final JavaArchive fooArchive = ShrinkWrap.create(JavaArchive.class).addClasses(Foo.class) + .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); + final JavaArchive barArchive = ShrinkWrap.create(JavaArchive.class).addClasses(Bar.class) + .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); + final JavaArchive bazArchive = ShrinkWrap.create(JavaArchive.class).addClasses(Baz.class) + .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); return ClassPath.builder().add(testArchive, fooArchive, barArchive, bazArchive).build(); } @@ -63,9 +66,10 @@ public void applicationContextSharedBetweenAllBeansWithinContainer() { } @Test - @SpecAssertions({ @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "b"), @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "d"), + @SpecAssertions({ @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "b"), + @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "d"), @SpecAssertion(section = SE_BOOTSTRAP, id = "f"), @SpecAssertion(section = SE_BOOTSTRAP, id = "f"), - @SpecAssertion(section = APPLICATION_CONTEXT, id = "a")}) + @SpecAssertion(section = APPLICATION_CONTEXT, id = "a") }) public void testEventIsFiredWhenAplicationContextInitialized() { ApplicationScopedObserver.reset(); try (SeContainer seContainer = SeContainerInitializer.newInstance().initialize()) { @@ -75,7 +79,8 @@ public void testEventIsFiredWhenAplicationContextInitialized() { } @Test - @SpecAssertions({ @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "c"), @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "d"), + @SpecAssertions({ @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "c"), + @SpecAssertion(section = APPLICATION_CONTEXT_SE, id = "d"), @SpecAssertion(section = APPLICATION_CONTEXT, id = "b"), @SpecAssertion(section = APPLICATION_CONTEXT, id = "c") }) public void testEventIsFiredWhenAplicationContextDestroyed() { ApplicationScopedObserver.reset(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Foo.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Foo.java index 257f2042d6..2da5113e1c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Foo.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/Foo.java @@ -18,11 +18,11 @@ @Dependent public class Foo { - + @Inject ApplicationScopedCounter counter; - - public void ping(){ + + public void ping() { counter.increment(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/AfterActivationInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/AfterActivationInterceptor.java index 7a48b8800e..6ade0ecbbb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/AfterActivationInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/AfterActivationInterceptor.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.se.context.activation.interceptor; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.annotation.Priority; import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.context.RequestScoped; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/BeforeActivationInterceptor.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/BeforeActivationInterceptor.java index b74d871515..14b5cfb6b4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/BeforeActivationInterceptor.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/BeforeActivationInterceptor.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.se.context.activation.interceptor; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.annotation.Priority; import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.context.RequestScoped; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestContextObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestContextObserver.java index b1b548b4db..4c1e00e49c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestContextObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestContextObserver.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.se.context.activation.interceptor; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.BeforeDestroyed; import jakarta.enterprise.context.Destroyed; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestScopeCounter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestScopeCounter.java index 7c5c08defa..f9b74fdc81 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestScopeCounter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/RequestScopeCounter.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.se.context.activation.interceptor; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; @@ -23,12 +24,11 @@ public class RequestScopeCounter { @Inject SecondCounter counter; - private AtomicInteger i= new AtomicInteger(0); + private AtomicInteger i = new AtomicInteger(0); - public int increment(){ + public int increment() { i.addAndGet(counter.add10()); return i.incrementAndGet(); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/SecondCounter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/SecondCounter.java index 5eb194c6cf..5cb41c4003 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/SecondCounter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/interceptor/SecondCounter.java @@ -14,16 +14,16 @@ package org.jboss.cdi.tck.tests.se.context.activation.interceptor; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.RequestScoped; @RequestScoped public class SecondCounter { - private AtomicInteger i= new AtomicInteger(0); + private AtomicInteger i = new AtomicInteger(0); - public int add10(){ + public int add10() { return i.addAndGet(10); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/ActivateRequestContextProgrammaticallyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/ActivateRequestContextProgrammaticallyTest.java index 8d3a1d572a..15f9cde266 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/ActivateRequestContextProgrammaticallyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/ActivateRequestContextProgrammaticallyTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.ACTIVATING_REQUEST_CONTEXT; import java.io.IOException; + import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/RequestScopeCounter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/RequestScopeCounter.java index 1e3257119e..58752952c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/RequestScopeCounter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/RequestScopeCounter.java @@ -14,16 +14,16 @@ package org.jboss.cdi.tck.tests.se.context.activation.programmatic; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.RequestScoped; @RequestScoped public class RequestScopeCounter { - private AtomicInteger i= new AtomicInteger(0); + private AtomicInteger i = new AtomicInteger(0); - public int increment(){ + public int increment() { return i.incrementAndGet(); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/TestContextActivator.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/TestContextActivator.java index 3f7c8c2678..e26e0f2988 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/TestContextActivator.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/activation/programmatic/TestContextActivator.java @@ -26,7 +26,6 @@ public class TestContextActivator { @Inject RequestScopeCounter requestScopeCounter; - public boolean activate() { return requestContextController.activate(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContext.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContext.java index 22e69f7474..e328a246e8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContext.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContext.java @@ -16,6 +16,7 @@ import java.lang.annotation.Annotation; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.spi.AlterableContext; import jakarta.enterprise.context.spi.Contextual; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContextSETest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContextSETest.java index 76ffacc05c..25c4e50040 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContextSETest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/CustomRequestContextSETest.java @@ -51,7 +51,8 @@ public static Archive deployment() { //define custom request context which is always active @Test - @SpecAssertions({ @SpecAssertion(section = Sections.BUILTIN_CONTEXTS, id = "a"), @SpecAssertion(section = Sections.BUILTIN_CONTEXTS, id = "b")}) + @SpecAssertions({ @SpecAssertion(section = Sections.BUILTIN_CONTEXTS, id = "a"), + @SpecAssertion(section = Sections.BUILTIN_CONTEXTS, id = "b") }) public void defineCustomRequestContext() { try (SeContainer seContainer = SeContainerInitializer.newInstance().initialize()) { RequestScopeCounter counter = seContainer.select(RequestScopeCounter.class).get(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/RequestScopeCounter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/RequestScopeCounter.java index 7ea751d1a2..b258d78993 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/RequestScopeCounter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/RequestScopeCounter.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.se.context.custom; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; @@ -23,12 +24,11 @@ public class RequestScopeCounter { @Inject SecondCounter counter; - private AtomicInteger i= new AtomicInteger(0); + private AtomicInteger i = new AtomicInteger(0); - public int increment(){ + public int increment() { i.addAndGet(counter.add10()); return i.incrementAndGet(); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/SecondCounter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/SecondCounter.java index fd71bf1d38..a256a737d4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/SecondCounter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/custom/SecondCounter.java @@ -14,16 +14,16 @@ package org.jboss.cdi.tck.tests.se.context.custom; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.RequestScoped; @RequestScoped public class SecondCounter { - private AtomicInteger i= new AtomicInteger(0); + private AtomicInteger i = new AtomicInteger(0); - public int add10(){ + public int add10() { return i.addAndGet(10); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/Payload.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/Payload.java index d685613ac5..d822170762 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/Payload.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/Payload.java @@ -21,7 +21,7 @@ public int getI() { private int i = 0; - public void add(int num){ + public void add(int num) { i = i + num; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/ReqScopedCounter.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/ReqScopedCounter.java index 769a316086..a0754dc1dc 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/ReqScopedCounter.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/ReqScopedCounter.java @@ -23,7 +23,7 @@ public class ReqScopedCounter { private AtomicInteger counter = new AtomicInteger(0); public int increment() { - return counter.incrementAndGet(); + return counter.incrementAndGet(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/RequestContextTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/RequestContextTest.java index 5a69556c0b..1924b6e83f 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/RequestContextTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/RequestContextTest.java @@ -56,26 +56,26 @@ public static Archive deployment() throws IOException { } @Test - @SpecAssertion(section = Sections.REQUEST_CONTEXT, id="db") - @SpecAssertion(section = Sections.REQUEST_CONTEXT, id="eb") + @SpecAssertion(section = Sections.REQUEST_CONTEXT, id = "db") + @SpecAssertion(section = Sections.REQUEST_CONTEXT, id = "eb") public void requestContextIsActiveDuringPostConstructCallback() { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); try (SeContainer container = seContainerInitializer .initialize()) { TestBean testBean = container.select(TestBean.class).get(); assertTrue(testBean.isReqContextActiveDuringPostConstruct()); - try{ + try { testBean.fail(); fail(); - }catch (ContextNotActiveException e){ + } catch (ContextNotActiveException e) { } } } @Test - @SpecAssertion(section = Sections.REQUEST_CONTEXT, id="da") - @SpecAssertion(section = Sections.REQUEST_CONTEXT, id="ea") + @SpecAssertion(section = Sections.REQUEST_CONTEXT, id = "da") + @SpecAssertion(section = Sections.REQUEST_CONTEXT, id = "ea") public void requestContextIsActiveDuringAsyncObserverNotification() throws InterruptedException { SeContainerInitializer seContainerInitializer = SeContainerInitializer.newInstance(); try (SeContainer container = seContainerInitializer diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/TestObserver.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/TestObserver.java index 88f94a8a43..7385931a99 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/TestObserver.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/context/request/TestObserver.java @@ -19,9 +19,8 @@ @ApplicationScoped public class TestObserver { - public void observes(@ObservesAsync Payload payload, ReqScopedCounter counter){ + public void observes(@ObservesAsync Payload payload, ReqScopedCounter counter) { payload.add(counter.increment()); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProvider.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProvider.java index b67502acee..da62d19ad9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProvider.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProvider.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.se.customCDIProvider; +import java.lang.annotation.Annotation; +import java.util.Iterator; + import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; @@ -20,9 +23,6 @@ import jakarta.enterprise.inject.spi.CDIProvider; import jakarta.enterprise.util.TypeLiteral; -import java.lang.annotation.Annotation; -import java.util.Iterator; - /** * @author Martin Kouba * @author Matej Novotny diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProviderTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProviderTest.java index a907368dbb..63c4891c0e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProviderTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/customCDIProvider/CustomCDIProviderTest.java @@ -37,14 +37,16 @@ public class CustomCDIProviderTest extends Arquillian { @Deployment public static Archive deployment() { - final JavaArchive testArchive = ShrinkWrap.create(JavaArchive.class).addClasses(CustomCDIProviderTest.class, CustomCDIProvider.class) + final JavaArchive testArchive = ShrinkWrap.create(JavaArchive.class) + .addClasses(CustomCDIProviderTest.class, CustomCDIProvider.class) .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml"); return ClassPath.builder().add(testArchive).build(); } @Test - @SpecAssertions({ @SpecAssertion(section = Sections.PROVIDER, id = "da"), @SpecAssertion(section = Sections.PROVIDER, id = "c") }) + @SpecAssertions({ @SpecAssertion(section = Sections.PROVIDER, id = "da"), + @SpecAssertion(section = Sections.PROVIDER, id = "c") }) public void testCustomCDIProvider() { CDI.setCDIProvider(new CustomCDIProvider()); CDI current = CDI.current(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/Bar.java index ad9b5df236..480873999d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/Bar.java @@ -17,6 +17,7 @@ @Dependent public class Bar { - - public void ping(){} + + public void ping() { + } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/ImplicitBeanArchiveWithSystemPropertyTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/ImplicitBeanArchiveWithSystemPropertyTest.java index 96f55352d8..d08802d918 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/ImplicitBeanArchiveWithSystemPropertyTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/implicit/ImplicitBeanArchiveWithSystemPropertyTest.java @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.Map; + import jakarta.enterprise.inject.se.SeContainer; import jakarta.enterprise.inject.se.SeContainerInitializer; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/Bar.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/Bar.java index 48cd883578..04041777d3 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/Bar.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/Bar.java @@ -15,7 +15,7 @@ public class Bar { - public String ping(){ + public String ping() { return Bar.class.getSimpleName(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/BarInterceptorBinding.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/BarInterceptorBinding.java index 266868ddd6..888a92a4f4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/BarInterceptorBinding.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/BarInterceptorBinding.java @@ -21,12 +21,13 @@ import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; -@Target({ElementType.METHOD, ElementType.TYPE}) +@Target({ ElementType.METHOD, ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @InterceptorBinding public @interface BarInterceptorBinding { - public static class BarInterceptorBindingLiteral extends AnnotationLiteral implements BarInterceptorBinding { + public static class BarInterceptorBindingLiteral extends AnnotationLiteral + implements BarInterceptorBinding { public static BarInterceptorBindingLiteral INSTANCE = new BarInterceptorBindingLiteral(); diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/FooProducer.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/FooProducer.java index b09a2e63fd..c783a4fbc5 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/FooProducer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/FooProducer.java @@ -18,7 +18,7 @@ public class FooProducer { @Produces - public Foo createFoo(){ + public Foo createFoo() { return new Foo(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestExtension.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestExtension.java index 2fcec7b8ec..90f8954bec 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestExtension.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestExtension.java @@ -27,7 +27,6 @@ public class TestExtension implements Extension { private AtomicBoolean barPATFired = new AtomicBoolean(false); private AtomicBoolean barPBFired = new AtomicBoolean(false); - void observesBarProducerPBA(@Observes ProcessBeanAttributes event) { barProducerPBAFired.set(true); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestStereotype.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestStereotype.java index a5b8564db1..d75bda41c6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestStereotype.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TestStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TrimmedBeanArchiveSETest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TrimmedBeanArchiveSETest.java index c84ef869e4..216609926b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TrimmedBeanArchiveSETest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/discovery/trimmed/TrimmedBeanArchiveSETest.java @@ -47,7 +47,8 @@ public class TrimmedBeanArchiveSETest extends Arquillian { @Deployment public static Archive deployment() { final JavaArchive trimmed = ShrinkWrap.create(JavaArchive.class) - .addClasses(TrimmedBeanArchiveSETest.class, Bar.class, Foo.class, BarProducer.class, FooProducer.class, TestStereotype.class, + .addClasses(TrimmedBeanArchiveSETest.class, Bar.class, Foo.class, BarProducer.class, FooProducer.class, + TestStereotype.class, TestExtension.class, BarInterceptor.class, BarInterceptorBinding.class) .addAsServiceProvider(Extension.class, TestExtension.class) .addAsManifestResource(TrimmedBeanArchiveSETest.class.getPackage(), "beans.xml", "beans.xml"); @@ -55,7 +56,8 @@ public static Archive deployment() { } @Test - @SpecAssertions({ @SpecAssertion(section = TRIMMED_BEAN_ARCHIVE, id = "a"), @SpecAssertion(section = BINDING_INTERCEPTOR_TO_BEAN, id = "c"), + @SpecAssertions({ @SpecAssertion(section = TRIMMED_BEAN_ARCHIVE, id = "a"), + @SpecAssertion(section = BINDING_INTERCEPTOR_TO_BEAN, id = "c"), @SpecAssertion(section = INTERCEPTION_FACTORY, id = "ca") }) public void discoveredTypes() { try (SeContainer seContainer = SeContainerInitializer.newInstance().initialize()) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/ObservingBean.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/ObservingBean.java index 5493475679..57d755ec47 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/ObservingBean.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/ObservingBean.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.se.events.lifecycle; +import java.util.ArrayList; +import java.util.List; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.BeforeDestroyed; import jakarta.enterprise.context.Initialized; @@ -20,9 +23,6 @@ import jakarta.enterprise.event.Shutdown; import jakarta.enterprise.event.Startup; -import java.util.ArrayList; -import java.util.List; - @ApplicationScoped public class ObservingBean { diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/StartupShutdownTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/StartupShutdownTest.java index 2c3f5594c7..3b127bf9a4 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/StartupShutdownTest.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/se/events/lifecycle/StartupShutdownTest.java @@ -14,14 +14,13 @@ package org.jboss.cdi.tck.tests.se.events.lifecycle; import static org.jboss.cdi.tck.TestGroups.SE; -import static org.jboss.cdi.tck.cdi.Sections.BEAN_ARCHIVE_SE; -import static org.jboss.cdi.tck.cdi.Sections.SE_BOOTSTRAP; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Shutdown; import jakarta.enterprise.event.Startup; import jakarta.enterprise.inject.se.SeContainer; import jakarta.enterprise.inject.se.SeContainerInitializer; + import org.jboss.arquillian.container.se.api.ClassPath; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.cdi.Sections; diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Elephant.java b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Elephant.java index 5831d318f3..e5a7a747c8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Elephant.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Elephant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Shark.java b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Shark.java index 9335a6e2eb..2d1fa77a07 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Shark.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/Shark.java @@ -15,6 +15,7 @@ package org.jboss.cdi.tck.tests.vetoed; import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.tests.vetoed.aquarium.Fishy; @Fishy 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 916057df34..c0d4367d8c 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 @@ -17,7 +17,7 @@ import static org.testng.Assert.assertEquals; import jakarta.enterprise.inject.Any; -import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -47,14 +47,14 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = WHAT_CLASSES_ARE_BEANS, id = "h")}) + @SpecAssertions({ @SpecAssertion(section = WHAT_CLASSES_ARE_BEANS, id = "h") }) public void testClassLevelVeto() { assertEquals(getCurrentManager().getBeans(Elephant.class, Any.Literal.INSTANCE).size(), 0); } @SuppressWarnings("serial") @Test - @SpecAssertions({ @SpecAssertion(section = WHAT_CLASSES_ARE_BEANS, id = "h")}) + @SpecAssertions({ @SpecAssertion(section = WHAT_CLASSES_ARE_BEANS, id = "h") }) public void testPackageLevelVeto() { assertEquals(getCurrentManager().getBeans(Piranha.class, Any.Literal.INSTANCE).size(), 0); assertEquals(getCurrentManager().getBeans(Shark.class, Any.Literal.INSTANCE).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 a4d33635e4..08fc58dd91 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,13 +19,13 @@ 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; 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) @Documented diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Piranha.java b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Piranha.java index c8f744d81d..0610bf394b 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Piranha.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/Piranha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/package-info.java b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/package-info.java index ea5d6d11d3..f842f5b1e0 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/package-info.java +++ b/impl/src/main/java/org/jboss/cdi/tck/tests/vetoed/aquarium/package-info.java @@ -17,4 +17,3 @@ package org.jboss.cdi.tck.tests.vetoed.aquarium; import jakarta.enterprise.inject.Vetoed; - diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/Assert.java b/impl/src/main/java/org/jboss/cdi/tck/util/Assert.java index 203bc34356..0194df0054 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/Assert.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/Assert.java @@ -14,11 +14,6 @@ package org.jboss.cdi.tck.util; -import jakarta.enterprise.inject.spi.Annotated; -import jakarta.enterprise.inject.spi.AnnotatedMember; -import jakarta.enterprise.inject.spi.AnnotatedParameter; -import jakarta.enterprise.inject.spi.AnnotatedType; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; @@ -28,6 +23,11 @@ import java.util.List; import java.util.Set; +import jakarta.enterprise.inject.spi.Annotated; +import jakarta.enterprise.inject.spi.AnnotatedMember; +import jakarta.enterprise.inject.spi.AnnotatedParameter; +import jakarta.enterprise.inject.spi.AnnotatedType; + /** * @author Martin Kouba * @@ -46,13 +46,13 @@ private Assert() { public static void assertAnnotationSetMatches(Set annotations, Class... requiredAnnotationTypes) { - if(annotations == null) { + if (annotations == null) { throw new IllegalArgumentException(); } - if (annotations.size() != requiredAnnotationTypes.length) { - fail(String.format("Set %s (%s) does not match array %s (%s)", annotations, annotations.size(), Arrays.toString(requiredAnnotationTypes), requiredAnnotationTypes.length)); + fail(String.format("Set %s (%s) does not match array %s (%s)", annotations, annotations.size(), + Arrays.toString(requiredAnnotationTypes), requiredAnnotationTypes.length)); } if (annotations.isEmpty() && requiredAnnotationTypes.length == 0) { @@ -63,7 +63,8 @@ public static void assertAnnotationSetMatches(Set annotati for (Annotation annotation : annotations) { if (!requiredAnnotationTypesList.contains(annotation.annotationType())) { - fail(String.format("Set %s (%s) does not match array %s (%s)", annotations, annotations.size(), requiredAnnotationTypesList, requiredAnnotationTypesList.size())); + fail(String.format("Set %s (%s) does not match array %s (%s)", annotations, annotations.size(), + requiredAnnotationTypesList, requiredAnnotationTypesList.size())); } } } @@ -75,14 +76,15 @@ public static void assertAnnotationSetMatches(Set annotati */ public static void assertTypeSetMatches(Set types, Type... requiredTypes) { - if(types == null) { + if (types == null) { throw new IllegalArgumentException(); } List requiredTypeList = Arrays.asList(requiredTypes); if (requiredTypes.length != types.size() || !types.containsAll(requiredTypeList)) { - fail(String.format("Set %s (%s) does not match array %s (%s)", types, types.size(), requiredTypeList, requiredTypeList.size())); + fail(String.format("Set %s (%s) does not match array %s (%s)", types, types.size(), requiredTypeList, + requiredTypeList.size())); } } @@ -93,14 +95,15 @@ public static void assertTypeSetMatches(Set types, Type... requi */ public static void assertTypeListMatches(List types, Type... requiredTypes) { - if(types == null) { + if (types == null) { throw new IllegalArgumentException(); } List requiredTypeList = Arrays.asList(requiredTypes); if (requiredTypes.length != types.size() || !types.containsAll(requiredTypeList)) { - fail(String.format("List %s (%s) does not match array %s (%s)", types, types.size(), requiredTypeList, requiredTypeList.size())); + fail(String.format("List %s (%s) does not match array %s (%s)", types, types.size(), requiredTypeList, + requiredTypeList.size())); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/BeanLookupUtils.java b/impl/src/main/java/org/jboss/cdi/tck/util/BeanLookupUtils.java index ca0f45b734..82859da6bb 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/BeanLookupUtils.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/BeanLookupUtils.java @@ -46,7 +46,7 @@ private BeanLookupUtils() { */ public static T getContextualReference(BeanManager beanManager, Class beanType, Annotation... qualifiers) { Set> beans = getBeans(beanManager, beanType, qualifiers); - return BeanLookupUtils.getContextualReference(beanManager, beanType, beans); + return BeanLookupUtils. getContextualReference(beanManager, beanType, beans); } /** @@ -60,7 +60,7 @@ public static T getContextualReference(BeanManager beanManager, TypeLiteral< Annotation... qualifiers) { Type beanType = beanTypeLiteral.getType(); Set> beans = getBeans(beanManager, beanType, qualifiers); - return BeanLookupUtils.getContextualReference(beanManager, beanType, beans); + return BeanLookupUtils. getContextualReference(beanManager, beanType, beans); } /** @@ -77,7 +77,7 @@ public static T getContextualReference(BeanManager beanManager, String name, if (beans == null || beans.isEmpty()) { return null; } - return BeanLookupUtils.getContextualReference(beanManager, beanType, beans); + return BeanLookupUtils. getContextualReference(beanManager, beanType, beans); } private static Set> getBeans(BeanManager beanManager, Type beanType, Annotation... qualifiers) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingAnnotatedType.java b/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingAnnotatedType.java index f101c00cfa..3443a768b6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingAnnotatedType.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingAnnotatedType.java @@ -50,10 +50,10 @@ public Set> getMethods() { @Override public String toString() { return "ForwardingAnnotatedType extending " + super.toString() - + " with Java class " + getJavaClass() - + " with constructors = " + getConstructors() - + " with fields = " + getFields() - + " with methods = " + getMethods(); + + " with Java class " + getJavaClass() + + " with constructors = " + getConstructors() + + " with fields = " + getFields() + + " with methods = " + getMethods(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingBeanAttributes.java b/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingBeanAttributes.java index 8f88b0caca..d6195bb164 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingBeanAttributes.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingBeanAttributes.java @@ -73,11 +73,11 @@ public boolean equals(Object obj) { @Override public String toString() { return "ForwardingBeanAttributes with name = " + getName() - + " with qualifiers = " + getQualifiers() - + " with scope = " + getScope() - + " with stereotypes = " + getStereotypes() - + " with types = " + getTypes() - + " alternative = " + isAlternative(); + + " with qualifiers = " + getQualifiers() + + " with scope = " + getScope() + + " with stereotypes = " + getStereotypes() + + " with types = " + getTypes() + + " alternative = " + isAlternative(); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingInjectionPoint.java b/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingInjectionPoint.java index a186e04973..123574f0b6 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingInjectionPoint.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/ForwardingInjectionPoint.java @@ -74,9 +74,9 @@ public int hashCode() { @Override public String toString() { - return "ForwardingInjectionPoint with type=" + getType() - + " with qualifiers=" + getQualifiers() - + " with delegate=" + isDelegate() - + " with transient=" + isTransient() + "."; + return "ForwardingInjectionPoint with type=" + getType() + + " with qualifiers=" + getQualifiers() + + " with delegate=" + isDelegate() + + " with transient=" + isTransient() + "."; } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/HierarchyDiscovery.java b/impl/src/main/java/org/jboss/cdi/tck/util/HierarchyDiscovery.java index 27dcd4d84a..bff0cba55c 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/HierarchyDiscovery.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/HierarchyDiscovery.java @@ -19,7 +19,6 @@ import java.util.HashSet; import java.util.Set; - public class HierarchyDiscovery { private final Type type; diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/ParameterizedTypeImpl.java b/impl/src/main/java/org/jboss/cdi/tck/util/ParameterizedTypeImpl.java index a4a50c4cda..2892d67bac 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/ParameterizedTypeImpl.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/ParameterizedTypeImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/SimpleLogger.java b/impl/src/main/java/org/jboss/cdi/tck/util/SimpleLogger.java index 4fd38ba85d..38e32153f8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/SimpleLogger.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/SimpleLogger.java @@ -20,7 +20,7 @@ /** * A very simple JDK logger wrapper. It should be used in complex tests only as logging in integration tests is not a good idea. - * + * * @author Martin Kouba */ public final class SimpleLogger implements Serializable { @@ -39,7 +39,7 @@ public SimpleLogger(Class clazz) { /** * Log message with specified parameters. {@link Level#FINE} is always used since the message is considered to be tracing * information. - * + * * @param message - log message * @param parameters - message parameters */ @@ -48,8 +48,9 @@ public void log(String message, Object... parameters) { } /** - * Log message with specified throwed exception. {@link Level#FINE} is always used since the message is considered to be tracing information. - * + * Log message with specified throwed exception. {@link Level#FINE} is always used since the message is considered to be + * tracing information. + * * @param thrown - exception to log */ public void log(Throwable thrown) { diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/Timer.java b/impl/src/main/java/org/jboss/cdi/tck/util/Timer.java index cb9446056e..fafde45531 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/Timer.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/Timer.java @@ -21,14 +21,17 @@ import org.jboss.cdi.tck.impl.ConfigurationFactory; /** - * Delays thread execution for specified time or unless stop conditions are satisfied according to the actual {@link ResolutionLogic}. This class is not + * Delays thread execution for specified time or unless stop conditions are satisfied according to the actual + * {@link ResolutionLogic}. This class is not * thread-safe. *

    - * Setting the sleep interval to the value less than 15 ms is questionable since some operating systems do not provide such precision. Moreover such values may + * Setting the sleep interval to the value less than 15 ms is questionable since some operating systems do not provide such + * precision. Moreover such values may * impact test performance. *

    *

    - * In case of no stop conditions are specified (not recommended), the timer logic corresponds to the regular {@link Thread#sleep(long)} execution. + * In case of no stop conditions are specified (not recommended), the timer logic corresponds to the regular + * {@link Thread#sleep(long)} execution. *

    */ public class Timer { @@ -67,7 +70,8 @@ public Timer() { } /** - * Set the delay value. The value is automatically adjusted according to the {@link Configuration#getTestTimeoutFactor()} so that it's possible to configure + * Set the delay value. The value is automatically adjusted according to the {@link Configuration#getTestTimeoutFactor()} so + * that it's possible to configure * timeouts according to the testing runtime performance and throughput. * * @param delay The delay in milliseconds @@ -78,7 +82,8 @@ public Timer setDelay(long delay) { } /** - * Set the delay value. The value is automatically adjusted according to the {@link Configuration#getTestTimeoutFactor()} so that it's possible to configure + * Set the delay value. The value is automatically adjusted according to the {@link Configuration#getTestTimeoutFactor()} so + * that it's possible to configure * timeouts according to the testing runtime performance and throughput. * * @param delay @@ -89,7 +94,7 @@ public Timer setDelay(long delay, TimeUnit timeUnit) { if (delay <= 0) { throw new IllegalArgumentException("Delay must be greater than zero"); } - this.delay = (timeUnit.toMillis(delay) * ConfigurationFactory.get().getTestTimeoutFactor() -1) / 100 + 1; + this.delay = (timeUnit.toMillis(delay) * ConfigurationFactory.get().getTestTimeoutFactor() - 1) / 100 + 1; return this; } @@ -189,7 +194,8 @@ public void clearStopConditions() { } /** - * @return true if stop conditions are satisfied according to actual {@link #resolutionLogic} before timeout occurs, false + * @return true if stop conditions are satisfied according to actual {@link #resolutionLogic} before timeout + * occurs, false * otherwise */ public boolean isStopConditionsSatisfiedBeforeTimeout() { @@ -303,7 +309,7 @@ public static enum ResolutionLogic { /** * All conditions must be satisfied */ - CONJUNCTION, ; + CONJUNCTION,; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/TransformationUtils.java b/impl/src/main/java/org/jboss/cdi/tck/util/TransformationUtils.java index 045319eb15..43b23c73b9 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/TransformationUtils.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/TransformationUtils.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,10 +33,11 @@ public static interface Function { /** * Returns a list that applies {@code function} to each element of {@code fromCollection}. - * + * * @throws IllegalArgumentException in case of a null argument */ - public static List transform(final Function function, final Collection fromCollection) { + public static List transform(final Function function, + final Collection fromCollection) { checkNotNull(fromCollection); checkNotNull(function); List result = new ArrayList(fromCollection.size()); diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedCallableWraper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedCallableWraper.java index ebe2928de3..4d2d984b64 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedCallableWraper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedCallableWraper.java @@ -13,19 +13,21 @@ */ package org.jboss.cdi.tck.util.annotated; -import jakarta.enterprise.inject.spi.AnnotatedCallable; -import jakarta.enterprise.inject.spi.AnnotatedParameter; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import jakarta.enterprise.inject.spi.AnnotatedCallable; +import jakarta.enterprise.inject.spi.AnnotatedParameter; + public class AnnotatedCallableWraper extends AnnotatedMemberWrapper implements AnnotatedCallable { private AnnotatedCallable delegate; private List> wrappedParameters; - public AnnotatedCallableWraper(AnnotatedCallable delegate, AnnotatedTypeWrapper declaringType, boolean keepOriginalAnnotations, + public AnnotatedCallableWraper(AnnotatedCallable delegate, AnnotatedTypeWrapper declaringType, + boolean keepOriginalAnnotations, Annotation... annotations) { super(delegate, declaringType, keepOriginalAnnotations, annotations); this.delegate = delegate; @@ -33,8 +35,9 @@ public AnnotatedCallableWraper(AnnotatedCallable delegate, AnnotatedTypeWrapp for (AnnotatedParameter annotatedParameter : delegate.getParameters()) { wrappedParameters - .add(new AnnotatedParameterWrapper(annotatedParameter, this, true, annotatedParameter.getAnnotations().toArray( - new Annotation[] { }))); + .add(new AnnotatedParameterWrapper(annotatedParameter, this, true, + annotatedParameter.getAnnotations().toArray( + new Annotation[] {}))); } } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedConstructorWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedConstructorWrapper.java index 40fde10d11..0470d62e0d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedConstructorWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedConstructorWrapper.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; + import jakarta.enterprise.inject.spi.AnnotatedConstructor; import jakarta.enterprise.inject.spi.AnnotatedParameter; @@ -26,11 +27,12 @@ public class AnnotatedConstructorWrapper extends AnnotatedCallableWraper i private AnnotatedConstructor delegate; private List> parameters; - public AnnotatedConstructorWrapper(AnnotatedConstructor delegate, AnnotatedTypeWrapper declaringType, boolean keepOriginalAnnotations, + public AnnotatedConstructorWrapper(AnnotatedConstructor delegate, AnnotatedTypeWrapper declaringType, + boolean keepOriginalAnnotations, Annotation... annotations) { super(delegate, declaringType, keepOriginalAnnotations, annotations); this.delegate = delegate; - this.parameters =delegate.getParameters(); + this.parameters = delegate.getParameters(); } public Constructor getJavaMember() { diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedFieldWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedFieldWrapper.java index 9b7175b126..07863d0cd2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedFieldWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedFieldWrapper.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,7 +23,8 @@ public class AnnotatedFieldWrapper extends AnnotatedMemberWrapper implemen private AnnotatedField delegate; - public AnnotatedFieldWrapper(AnnotatedField delegate, AnnotatedTypeWrapper declaringType, boolean keepOriginalAnnotations, Annotation... annotations) { + public AnnotatedFieldWrapper(AnnotatedField delegate, AnnotatedTypeWrapper declaringType, + boolean keepOriginalAnnotations, Annotation... annotations) { super(delegate, declaringType, keepOriginalAnnotations, annotations); this.delegate = delegate; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMemberWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMemberWrapper.java index 273ae762c2..e841a67b7d 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMemberWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMemberWrapper.java @@ -13,18 +13,20 @@ */ package org.jboss.cdi.tck.util.annotated; -import jakarta.enterprise.inject.spi.AnnotatedMember; import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Type; import java.util.Set; +import jakarta.enterprise.inject.spi.AnnotatedMember; + public class AnnotatedMemberWrapper extends AnnotatedWrapper implements AnnotatedMember { private AnnotatedTypeWrapper declaringType; private AnnotatedMember delegate; - public AnnotatedMemberWrapper(AnnotatedMember delegate, AnnotatedTypeWrapper declaringType, boolean keepOriginalAnnotations, Annotation... annotations) { + public AnnotatedMemberWrapper(AnnotatedMember delegate, AnnotatedTypeWrapper declaringType, + boolean keepOriginalAnnotations, Annotation... annotations) { super(delegate, keepOriginalAnnotations, annotations); this.delegate = delegate; this.declaringType = declaringType; diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMethodWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMethodWrapper.java index f8af96c908..ebfa17aed2 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMethodWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedMethodWrapper.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -24,8 +24,9 @@ public class AnnotatedMethodWrapper extends AnnotatedCallableWraper implem private AnnotatedMethod delegate; - public AnnotatedMethodWrapper(AnnotatedMethod delegate,AnnotatedTypeWrapper declaringType, boolean keepOriginalAnnotations, Annotation... annotations ) { - super(delegate, declaringType,keepOriginalAnnotations, annotations); + public AnnotatedMethodWrapper(AnnotatedMethod delegate, AnnotatedTypeWrapper declaringType, + boolean keepOriginalAnnotations, Annotation... annotations) { + super(delegate, declaringType, keepOriginalAnnotations, annotations); this.delegate = delegate; } @@ -33,9 +34,8 @@ public Method getJavaMember() { return delegate.getJavaMember(); } - public AnnotatedParameter getParameter(int position) { - return super.getParameters().get(position); + return super.getParameters().get(position); } public AnnotatedTypeWrapper getDeclaringType() { @@ -56,5 +56,4 @@ public Set getAnnotations(Class annotationType) { return delegate.getAnnotations(annotationType); } - } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedParameterWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedParameterWrapper.java index c08fb110f2..2dc974098e 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedParameterWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedParameterWrapper.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,17 +22,18 @@ public class AnnotatedParameterWrapper extends AnnotatedWrapper implements An private AnnotatedParameter delegate; private AnnotatedCallableWraper declaringMethod; - public AnnotatedParameterWrapper(AnnotatedParameter delegate, AnnotatedCallableWraper declaringMethod, boolean keepOriginalAnnotations, Annotation... annotations) { + public AnnotatedParameterWrapper(AnnotatedParameter delegate, AnnotatedCallableWraper declaringMethod, + boolean keepOriginalAnnotations, Annotation... annotations) { super(delegate, keepOriginalAnnotations, annotations); this.declaringMethod = declaringMethod; this.delegate = delegate; } - public AnnotatedCallableWraper getDeclaringCallable(){ + + public AnnotatedCallableWraper getDeclaringCallable() { return declaringMethod; } - public int getPosition() { return delegate.getPosition(); } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypeWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypeWrapper.java index d8583f2328..ff710cce06 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypeWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypeWrapper.java @@ -6,20 +6,21 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.util.annotated; +import java.lang.annotation.Annotation; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.inject.spi.AnnotatedConstructor; import jakarta.enterprise.inject.spi.AnnotatedField; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedType; -import java.lang.annotation.Annotation; -import java.util.HashSet; -import java.util.Set; public class AnnotatedTypeWrapper extends AnnotatedWrapper implements AnnotatedType { private AnnotatedType delegate; @@ -33,17 +34,17 @@ public AnnotatedTypeWrapper(AnnotatedType delegate, boolean keepOriginalAnnot this.constructors = new HashSet>(); for (AnnotatedConstructor constructor : delegate.getConstructors()) { constructors.add(new AnnotatedConstructorWrapper(constructor, this, true, constructor.getAnnotations().toArray( - new Annotation[] { }))); + new Annotation[] {}))); } this.fields = new HashSet>(); for (AnnotatedField field : delegate.getFields()) { - fields.add(new AnnotatedFieldWrapper(field, this, true, field.getAnnotations().toArray(new Annotation[] { }))); + fields.add(new AnnotatedFieldWrapper(field, this, true, field.getAnnotations().toArray(new Annotation[] {}))); } this.methods = new HashSet>(); for (AnnotatedMethod method : delegate.getMethods()) { - methods.add(new AnnotatedMethodWrapper(method, this, true, method.getAnnotations().toArray(new Annotation[] { }))); + methods.add(new AnnotatedMethodWrapper(method, this, true, method.getAnnotations().toArray(new Annotation[] {}))); } } @@ -63,4 +64,4 @@ public Class getJavaClass() { public Set> getMethods() { return methods; } -} \ No newline at end of file +} diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypes.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypes.java index 203640b895..0677c180a8 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypes.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedTypes.java @@ -64,7 +64,8 @@ public static boolean compareAnnotatedCallable(AnnotatedCallable m1, Annotate /** * compares two annotated elements to see if they have the same annotations */ - public static boolean compareAnnotatedParameters(List> p1, List> p2) { + public static boolean compareAnnotatedParameters(List> p1, + List> p2) { if (p1.size() != p2.size()) { return false; } diff --git a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedWrapper.java b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedWrapper.java index 5e898e1ade..617532d197 100644 --- a/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedWrapper.java +++ b/impl/src/main/java/org/jboss/cdi/tck/util/annotated/AnnotatedWrapper.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java b/impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java index 42a193ac32..59a28ae18d 100644 --- a/impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java +++ b/impl/src/main/java/org/jboss/shrinkwrap/api/BeanDiscoveryMode.java @@ -15,7 +15,9 @@ public enum BeanDiscoveryMode { - NONE("none"), ANNOTATED("annotated"), ALL("all"); + NONE("none"), + ANNOTATED("annotated"), + ALL("all"); private final String value; diff --git a/impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java b/impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java index 020822346a..eace71b740 100644 --- a/impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java +++ b/impl/src/main/java/org/jboss/shrinkwrap/api/BeansXmlVersion.java @@ -15,7 +15,9 @@ public enum BeansXmlVersion { - v30("3.0"), v20("2.0"), v11("1.1"); + v30("3.0"), + v20("2.0"), + v11("1.1"); private final String value; diff --git a/impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java b/impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java index 177d43a588..8375d153a9 100644 --- a/impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java +++ b/impl/src/main/java/org/jboss/shrinkwrap/impl/BeansXml.java @@ -13,10 +13,6 @@ */ package org.jboss.shrinkwrap.impl; -import org.jboss.shrinkwrap.api.BeanDiscoveryMode; -import org.jboss.shrinkwrap.api.BeansXmlVersion; -import org.jboss.shrinkwrap.api.asset.Asset; - import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.ArrayList; @@ -24,13 +20,19 @@ import java.util.Collections; import java.util.List; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; +import org.jboss.shrinkwrap.api.BeansXmlVersion; +import org.jboss.shrinkwrap.api.asset.Asset; + /** * Allows to create a beans.xml file programmatically. * By default it uses discovery mode annotated and has version 3.0 */ public class BeansXml implements Asset { - public static final BeansXml SUPPRESSOR = new BeansXml(Collections.> emptyList(), Collections.> emptyList(), Collections.> emptyList(), Collections.> emptyList(), Collections. emptyList()) { + public static final BeansXml SUPPRESSOR = new BeansXml(Collections.> emptyList(), + Collections.> emptyList(), Collections.> emptyList(), Collections.> emptyList(), + Collections. emptyList()) { @Override public BeanDiscoveryMode getBeanDiscoveryMode() { return BeanDiscoveryMode.NONE; @@ -190,7 +192,8 @@ public IfClassNotAvailable(String className) { } public BeansXml() { - this(new ArrayList>(), new ArrayList>(), new ArrayList>(), new ArrayList>(), new ArrayList()); + this(new ArrayList>(), new ArrayList>(), new ArrayList>(), new ArrayList>(), + new ArrayList()); } public BeansXml(BeanDiscoveryMode mode) { @@ -198,7 +201,8 @@ public BeansXml(BeanDiscoveryMode mode) { setBeanDiscoveryMode(mode); } - private BeansXml(List> alternatives, List> interceptors, List> decorators, List> stereotypes, List excludeFilters) { + private BeansXml(List> alternatives, List> interceptors, List> decorators, + List> stereotypes, List excludeFilters) { this.alternatives = alternatives; this.interceptors = interceptors; this.decorators = decorators; @@ -289,11 +293,11 @@ public InputStream openStream() { private void appendExcludeFilters(List filters, StringBuilder xml) { if (filters.size() > 0) { xml.append(OPENING_TAG_PREFIX).append(SCAN_ELEMENT_NAME).append(TAG_SUFFIX_NEW_LINE); - for(Exclude ex : filters) { + for (Exclude ex : filters) { xml.append(OPENING_TAG_PREFIX).append(EXCLUDE_ELEMENT_NAME); appendAttribute(NAME_ATTRIBUTE_NAME, ex.getClassFilter(), xml); List conditions = ex.getConditions(); - if(conditions.isEmpty()) { + if (conditions.isEmpty()) { xml.append(TAG_SUFFIX_SELF_CLOSE_NEW_LINE); } else { xml.append(TAG_SUFFIX_NEW_LINE); @@ -330,7 +334,8 @@ private static void appendSection(String name, String subName, List> cl private static void appendClasses(String name, List> classes, StringBuilder xml) { for (Class clazz : classes) { - xml.append(OPENING_TAG_PREFIX).append(name).append(TAG_SUFFIX).append(clazz.getName()).append(CLOSING_TAG_PREFIX).append(name).append(TAG_SUFFIX_NEW_LINE); + xml.append(OPENING_TAG_PREFIX).append(name).append(TAG_SUFFIX).append(clazz.getName()).append(CLOSING_TAG_PREFIX) + .append(name).append(TAG_SUFFIX_NEW_LINE); } } } diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/package-info.java b/impl/src/test/java/org/jboss/cdi/tck/test/package-info.java index 9c974ee4d6..485b23d9c4 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/package-info.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/package-info.java @@ -13,6 +13,7 @@ */ /** - * Don't use the same package for unit tests, otherwise these might be added to ShrinkWrap test archives along with impl classes. + * Don't use the same package for unit tests, otherwise these might be added to ShrinkWrap test archives along with impl + * classes. */ package org.jboss.cdi.tck.test; diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java b/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java index ecec2192df..ec8ae002f0 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.test.porting; import jakarta.enterprise.context.spi.Context; + import org.jboss.cdi.tck.spi.Contextuals; public class DummyContextuals implements Contextuals { diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java b/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java index a7fc0edabb..2f880a25ba 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.test.porting; import jakarta.enterprise.context.spi.Contextual; + import org.jboss.cdi.tck.spi.CreationalContexts; public class DummyCreationalContexts implements CreationalContexts { diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java b/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java index 3f61fa6a73..3aa22ae70d 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java @@ -26,7 +26,8 @@ public T evaluateValueExpression(BeanManager beanManager, String expression, } @Override - public T evaluateMethodExpression(BeanManager beanManager, String expression, Class expectedType, Class[] expectedParamTypes, + public T evaluateMethodExpression(BeanManager beanManager, String expression, Class expectedType, + Class[] expectedParamTypes, Object[] expectedParams) { throw new UnsupportedOperationException(); } diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java index 29d9468bb4..fcbd9fee78 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/AssetUtilTest.java @@ -16,6 +16,9 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.io.File; +import java.io.IOException; + import org.apache.commons.io.FileUtils; import org.jboss.cdi.tck.shrinkwrap.AssetUtil; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; @@ -25,16 +28,14 @@ import org.jboss.shrinkwrap.impl.BeansXml; import org.testng.annotations.Test; -import java.io.File; -import java.io.IOException; - public class AssetUtilTest { @Test public void testReadAssetContentAsString() throws IOException { // TODO these are weak assertions because BeansXml cannot be translated to String easily - Asset asset = new BeansXml(BeanDiscoveryMode.ANNOTATED).alternatives(Engine.class).setBeansXmlVersion(BeansXmlVersion.v20); + Asset asset = new BeansXml(BeanDiscoveryMode.ANNOTATED).alternatives(Engine.class) + .setBeansXmlVersion(BeansXmlVersion.v20); String content = AssetUtil.readAssetContent(asset); assertTrue(content != null); assertTrue(content.length() > 0); diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/Engine.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/Engine.java index d9459da711..c0c392d0d7 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/Engine.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/Engine.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/EnginePowered.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/EnginePowered.java index edfcf3313a..5bdac5213e 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/EnginePowered.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/EnginePowered.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/PoweredEngine.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/PoweredEngine.java index 280a938a03..310bc862e8 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/PoweredEngine.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/PoweredEngine.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/WebArchiveBuilderTest.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/WebArchiveBuilderTest.java index 01168a0039..b6690919e3 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/WebArchiveBuilderTest.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/WebArchiveBuilderTest.java @@ -37,7 +37,8 @@ public class WebArchiveBuilderTest { public void testAddClasses() { // Optimization possible, no skipped classes - WebArchive archive = new WebArchiveBuilder().withTestClass(TestClass.class).withClasses(Qux.class, Excluded.class).build(); + WebArchive archive = new WebArchiveBuilder().withTestClass(TestClass.class).withClasses(Qux.class, Excluded.class) + .build(); assertContainsClass(archive, Qux.class); assertContainsClass(archive, Excluded.class); @@ -46,7 +47,8 @@ public void testAddClasses() { assertContainsInnerClass(archive, Ping.class); // Optimization possible, skip excluded class and test class - archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true).withClasses(Qux.class, Excluded.class, Engine.class) + archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true) + .withClasses(Qux.class, Excluded.class, Engine.class) .withExcludedClass(Excluded.class.getName()).build(); assertContainsClass(archive, Qux.class); @@ -58,16 +60,19 @@ public void testAddClasses() { assertDoesNotContainInnerClass(archive, PoweredEngine.PoweredEngineLiteral.class); // Inner class included - archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true).withClasses(EnginePowered.class).build(); + archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true).withClasses(EnginePowered.class) + .build(); assertContainsClass(archive, EnginePowered.class); assertContainsInnerClass(archive, EnginePowered.EnginePoweredLiteral.class); - archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true).withClasses(PoweredEngine.class).build(); + archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true).withClasses(PoweredEngine.class) + .build(); assertContainsClass(archive, PoweredEngine.class); assertContainsInnerClass(archive, PoweredEngine.PoweredEngineLiteral.class); // Optimization not possible, skip excluded class and test class - archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true).withClasses(Qux.class, Excluded.class, Bar.class) + archive = new WebArchiveBuilder().withTestClass(TestClass.class).setAsClientMode(true) + .withClasses(Qux.class, Excluded.class, Bar.class) .withExcludedClass(Excluded.class.getName()).build(); assertContainsClass(archive, Qux.class); @@ -89,7 +94,8 @@ public void testAddPackage() { assertContainsInnerClass(archive, Baz.class); assertContainsInnerClass(archive, Ping.class); - archive = new WebArchiveBuilder().withTestClassPackage(TestClass.class).setAsClientMode(true).withExcludedClass(Excluded.class.getName()).build(); + archive = new WebArchiveBuilder().withTestClassPackage(TestClass.class).setAsClientMode(true) + .withExcludedClass(Excluded.class.getName()).build(); System.out.printf("Archive: %s\n", archive.toString(true)); assertContainsClass(archive, Qux.class); @@ -98,7 +104,8 @@ public void testAddPackage() { assertContainsInnerClass(archive, Baz.class); assertDoesNotContainInnerClass(archive, Ping.class); - archive = new WebArchiveBuilder().withTestClassPackage(TestClass.class).setAsClientMode(true).withClasses(Qux.class, Excluded.class, Bar.class) + archive = new WebArchiveBuilder().withTestClassPackage(TestClass.class).setAsClientMode(true) + .withClasses(Qux.class, Excluded.class, Bar.class) .withExcludedClass(Excluded.class.getName()).build(); assertContainsClass(archive, Qux.class); @@ -108,14 +115,14 @@ public void testAddPackage() { assertContainsInnerClass(archive, Baz.class); assertDoesNotContainInnerClass(archive, Ping.class); } - + @Test public void testGeneratedArchiveName() throws NoSuchAlgorithmException { WebArchive archive = new WebArchiveBuilder().withTestClass(TestClass.class).build(); MessageDigest md = MessageDigest.getInstance("SHA-1"); md.update(TestClass.class.getName().getBytes()); byte[] digest = md.digest(); - + StringBuilder hexString = new StringBuilder(); for (int i = 0; i < digest.length; i++) { hexString.append(Integer.toHexString(0xFF & digest[i])); diff --git a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java index fe844ca80e..136efbf865 100644 --- a/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java +++ b/impl/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/beansxml/BeansXmlTest.java @@ -20,7 +20,6 @@ import org.testng.Assert; import org.testng.annotations.Test; - /** * A very simple test that checks if {@link BeansXml} API constructs a valid descriptor with certain format. * Note that {@link BeansXml} doesn't include XML namespace. diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedReceiverTypes.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedReceiverTypes.java index eb54710a2f..041283ee1b 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedReceiverTypes.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedReceiverTypes.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.declarations.MethodInfo; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.declarations.MethodInfo; + @Target(ElementType.TYPE_USE) @Retention(RetentionPolicy.RUNTIME) @interface AnnReceiver1 { @@ -87,13 +87,15 @@ private static void verifyMethodWithReceiverOnGenericClass(ClassInfo clazz) { if (method.receiverType().isClass()) { // JDK 11 reflection sees this as a class assert method.receiverType().asClass().annotations().size() == 1; assert method.receiverType().asClass().hasAnnotation(AnnReceiver1.class); - assert method.receiverType().asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.ReceiverOnGenericClass"); + assert method.receiverType().asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.ReceiverOnGenericClass"); } else if (method.receiverType().isParameterizedType()) { // JDK 17 reflection correctly evaluates this as a parameterized type if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert method.receiverType().asParameterizedType().annotations().size() == 1; assert method.receiverType().asParameterizedType().hasAnnotation(AnnReceiver1.class); } - assert method.receiverType().asParameterizedType().declaration().name().equals("org.jboss.cdi.lang.model.tck.ReceiverOnGenericClass"); + assert method.receiverType().asParameterizedType().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.ReceiverOnGenericClass"); } } diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedSuperTypes.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedSuperTypes.java index d84d18d0ee..437b283793 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedSuperTypes.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedSuperTypes.java @@ -13,15 +13,15 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.types.Type; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.List; +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.types.Type; + @Target(ElementType.TYPE_USE) @Retention(RetentionPolicy.RUNTIME) @interface AnnSuperClass { @@ -64,7 +64,7 @@ interface SuperInterface2 { public class AnnotatedSuperTypes extends @AnnSuperClass SuperClass<@AnnSuperClassTypeParam T> implements @AnnSuperInterface1 SuperInterface1<@AnnSuperInterfaceTypeParam1 List<@AnnSuperInterfaceTypeParam2 String>>, - @AnnSuperInterface2 SuperInterface2 { + @AnnSuperInterface2 SuperInterface2 { public static void verify(ClassInfo clazz) { assert clazz.typeParameters().size() == 1; @@ -89,7 +89,8 @@ private static void verifyExtends(ClassInfo clazz) { assert clazz.superClass().asParameterizedType().typeArguments().get(0).isTypeVariable(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert clazz.superClass().asParameterizedType().typeArguments().get(0).asTypeVariable().annotations().size() == 1; - assert clazz.superClass().asParameterizedType().typeArguments().get(0).asTypeVariable().hasAnnotation(AnnSuperClassTypeParam.class); + assert clazz.superClass().asParameterizedType().typeArguments().get(0).asTypeVariable() + .hasAnnotation(AnnSuperClassTypeParam.class); } assert clazz.superClass().asParameterizedType().typeArguments().get(0).asTypeVariable().name().equals("T"); } @@ -105,7 +106,8 @@ private static void verifyImplements(ClassInfo clazz) { assert clazz.superInterfaces().get(0).asParameterizedType().annotations().size() == 1; assert clazz.superInterfaces().get(0).asParameterizedType().hasAnnotation(AnnSuperInterface1.class); } - assert clazz.superInterfaces().get(0).asParameterizedType().declaration().name().equals("org.jboss.cdi.lang.model.tck.SuperInterface1"); + assert clazz.superInterfaces().get(0).asParameterizedType().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SuperInterface1"); assert clazz.superInterfaces().get(0).asParameterizedType().typeArguments().size() == 1; Type typearg = clazz.superInterfaces().get(0).asParameterizedType().typeArguments().get(0); assert typearg.isParameterizedType(); @@ -118,7 +120,8 @@ private static void verifyImplements(ClassInfo clazz) { assert typearg.asParameterizedType().typeArguments().get(0).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert typearg.asParameterizedType().typeArguments().get(0).asClass().annotations().size() == 1; - assert typearg.asParameterizedType().typeArguments().get(0).asClass().hasAnnotation(AnnSuperInterfaceTypeParam2.class); + assert typearg.asParameterizedType().typeArguments().get(0).asClass() + .hasAnnotation(AnnSuperInterfaceTypeParam2.class); } assert typearg.asParameterizedType().typeArguments().get(0).asClass().declaration().name().equals("java.lang.String"); @@ -128,6 +131,7 @@ private static void verifyImplements(ClassInfo clazz) { assert clazz.superInterfaces().get(1).asClass().annotations().size() == 1; assert clazz.superInterfaces().get(1).asClass().hasAnnotation(AnnSuperInterface2.class); } - assert clazz.superInterfaces().get(1).asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.SuperInterface2"); + assert clazz.superInterfaces().get(1).asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SuperInterface2"); } } diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedThrowsTypes.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedThrowsTypes.java index 7b4c79033a..eecfd4e03a 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedThrowsTypes.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedThrowsTypes.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.declarations.MethodInfo; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.declarations.MethodInfo; + @Target(ElementType.TYPE_USE) @Retention(RetentionPolicy.RUNTIME) @interface AnnThrows1 { diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedTypes.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedTypes.java index 7e2b6a07e2..2eee2df8cf 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedTypes.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotatedTypes.java @@ -13,13 +13,7 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.AnnotationInfo; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.declarations.FieldInfo; -import jakarta.enterprise.lang.model.declarations.MethodInfo; -import jakarta.enterprise.lang.model.types.PrimitiveType; -import jakarta.enterprise.lang.model.types.Type; -import jakarta.enterprise.lang.model.types.TypeVariable; +import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertType; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -29,7 +23,12 @@ import java.util.List; import java.util.Map; -import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertType; +import jakarta.enterprise.lang.model.AnnotationInfo; +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.declarations.FieldInfo; +import jakarta.enterprise.lang.model.declarations.MethodInfo; +import jakarta.enterprise.lang.model.types.PrimitiveType; +import jakarta.enterprise.lang.model.types.Type; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @@ -107,77 +106,77 @@ } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.TYPE_USE}) +@Target({ ElementType.CONSTRUCTOR, ElementType.TYPE_USE }) @interface AnnConstructor { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnConstructorParameter { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE_USE}) +@Target({ ElementType.METHOD, ElementType.TYPE_USE }) @interface AnnVoidMethod { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnMethodParameter { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnPrimitiveField { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnClassField { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnArrayField1 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnArrayField2 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnArrayField3 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnArrayField4 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnParameterizedField1 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnParameterizedField2 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnParameterizedField3 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnParameterizedField4 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.TYPE_USE}) +@Target({ ElementType.FIELD, ElementType.TYPE_USE }) @interface AnnTypeVariableField { } @@ -277,12 +276,7 @@ } @AnnClass -public class AnnotatedTypes<@AnnTypeVariableClass1 A, - @AnnTypeVariableClass2 B extends @AnnTypeVariableClass3 A, - @AnnTypeVariableClass4 C extends @AnnTypeVariableClass5 Number, - @AnnTypeVariableClass6 D extends @AnnTypeVariableClass7 Number & @AnnTypeVariableClass8 CharSequence, - @AnnTypeVariableClass9 E extends @AnnTypeVariableClass10 C, - @AnnTypeVariableClass11 F extends @AnnTypeVariableClass12 List<@AnnTypeVariableClass13 ? extends @AnnTypeVariableClass14 Number>> { +public class AnnotatedTypes<@AnnTypeVariableClass1 A, @AnnTypeVariableClass2 B extends @AnnTypeVariableClass3 A, @AnnTypeVariableClass4 C extends @AnnTypeVariableClass5 Number, @AnnTypeVariableClass6 D extends @AnnTypeVariableClass7 Number & @AnnTypeVariableClass8 CharSequence, @AnnTypeVariableClass9 E extends @AnnTypeVariableClass10 C, @AnnTypeVariableClass11 F extends @AnnTypeVariableClass12 List<@AnnTypeVariableClass13 ? extends @AnnTypeVariableClass14 Number>> { @AnnConstructor AnnotatedTypes(@AnnConstructorParameter String parameter) { @@ -307,12 +301,7 @@ void voidMethod(@AnnMethodParameter String parameter) { @AnnTypeVariableField B typeVariableField; - <@AnnTypeVariableMethod1 T, - @AnnTypeVariableMethod2 U extends @AnnTypeVariableMethod3 C, - @AnnTypeVariableMethod4 V extends @AnnTypeVariableMethod5 Number, - @AnnTypeVariableMethod6 W extends @AnnTypeVariableMethod7 Number & @AnnTypeVariableMethod8 CharSequence, - @AnnTypeVariableMethod9 X extends @AnnTypeVariableMethod10 List<@AnnTypeVariableMethod11 ? super @AnnTypeVariableMethod12 String>> - void typeVariableMethod() { + <@AnnTypeVariableMethod1 T, @AnnTypeVariableMethod2 U extends @AnnTypeVariableMethod3 C, @AnnTypeVariableMethod4 V extends @AnnTypeVariableMethod5 Number, @AnnTypeVariableMethod6 W extends @AnnTypeVariableMethod7 Number & @AnnTypeVariableMethod8 CharSequence, @AnnTypeVariableMethod9 X extends @AnnTypeVariableMethod10 List<@AnnTypeVariableMethod11 ? super @AnnTypeVariableMethod12 String>> void typeVariableMethod() { } void wildcardMethod( @@ -325,7 +314,8 @@ void wildcardMethod( public static void verify(ClassInfo clazz) { // https://bugs.openjdk.java.net/browse/JDK-8202469 // fixed in OpenJDK 15 - boolean reflectionBug = AnnotatedTypes.class.getTypeParameters()[1].getAnnotatedBounds()[0].getAnnotations().length == 0; + boolean reflectionBug = AnnotatedTypes.class.getTypeParameters()[1].getAnnotatedBounds()[0] + .getAnnotations().length == 0; verifyTypeParameters(clazz, reflectionBug); verifyConstructor(clazz); @@ -356,7 +346,8 @@ private static void verifyTypeParameters(ClassInfo clazz, boolean reflectionBug) assert clazz.typeParameters().get(0).asTypeVariable().bounds().size() == 1; assert clazz.typeParameters().get(0).asTypeVariable().bounds().get(0).isClass(); assert clazz.typeParameters().get(0).asTypeVariable().bounds().get(0).asClass().annotations().isEmpty(); - assert clazz.typeParameters().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Object"); + assert clazz.typeParameters().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name() + .equals("java.lang.Object"); // @AnnTypeVariableClass2 B extends @AnnTypeVariableClass3 A assert clazz.typeParameters().get(1).isTypeVariable(); @@ -368,7 +359,8 @@ private static void verifyTypeParameters(ClassInfo clazz, boolean reflectionBug) if (!reflectionBug) { assert clazz.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().annotations().size() == 1; // @AnnTypeVariableClass1 if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert clazz.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().hasAnnotation(AnnTypeVariableClass3.class); + assert clazz.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable() + .hasAnnotation(AnnTypeVariableClass3.class); } } assert clazz.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().name().equals("A"); @@ -382,10 +374,12 @@ private static void verifyTypeParameters(ClassInfo clazz, boolean reflectionBug) assert clazz.typeParameters().get(2).asTypeVariable().bounds().get(0).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert clazz.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().annotations().size() == 1; - assert clazz.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().hasAnnotation(AnnTypeVariableClass5.class); + assert clazz.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass() + .hasAnnotation(AnnTypeVariableClass5.class); } assert clazz.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().declaration().isPlainClass(); - assert clazz.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Number"); + assert clazz.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().declaration().name() + .equals("java.lang.Number"); // @AnnTypeVariableClass6 D extends @AnnTypeVariableClass7 Number & @AnnTypeVariableClass8 CharSequence assert clazz.typeParameters().get(3).isTypeVariable(); @@ -396,17 +390,21 @@ private static void verifyTypeParameters(ClassInfo clazz, boolean reflectionBug) assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(0).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().annotations().size() == 1; - assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().hasAnnotation(AnnTypeVariableClass7.class); + assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass() + .hasAnnotation(AnnTypeVariableClass7.class); } assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().declaration().isPlainClass(); - assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Number"); + assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().declaration().name() + .equals("java.lang.Number"); assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(1).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().annotations().size() == 1; - assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().hasAnnotation(AnnTypeVariableClass8.class); + assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass() + .hasAnnotation(AnnTypeVariableClass8.class); } assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().declaration().isInterface(); - assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().declaration().name().equals("java.lang.CharSequence"); + assert clazz.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().declaration().name() + .equals("java.lang.CharSequence"); // @AnnTypeVariableClass9 E extends @AnnTypeVariableClass10 C assert clazz.typeParameters().get(4).isTypeVariable(); @@ -418,17 +416,21 @@ private static void verifyTypeParameters(ClassInfo clazz, boolean reflectionBug) if (!reflectionBug) { assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().annotations().size() == 1; // @AnnTypeVariableClass4 if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().hasAnnotation(AnnTypeVariableClass10.class); + assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable() + .hasAnnotation(AnnTypeVariableClass10.class); } } assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().name().equals("C"); assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().size() == 1; assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().annotations().size() == 1; - assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().hasAnnotation(AnnTypeVariableClass5.class); + assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass() + .annotations().size() == 1; + assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass() + .hasAnnotation(AnnTypeVariableClass5.class); } - assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Number"); + assert clazz.typeParameters().get(4).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass() + .declaration().name().equals("java.lang.Number"); // @AnnTypeVariableClass11 F extends @AnnTypeVariableClass12 List<@AnnTypeVariableClass13 ? extends @AnnTypeVariableClass14 Number> assert clazz.typeParameters().get(5).isTypeVariable(); @@ -438,24 +440,35 @@ private static void verifyTypeParameters(ClassInfo clazz, boolean reflectionBug) assert clazz.typeParameters().get(5).asTypeVariable().bounds().size() == 1; assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).isParameterizedType(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().annotations().size() == 1; - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().hasAnnotation(AnnTypeVariableClass12.class); + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().annotations() + .size() == 1; + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType() + .hasAnnotation(AnnTypeVariableClass12.class); } assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().declaration().isInterface(); - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().declaration().name().equals("java.util.List"); + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().declaration().name() + .equals("java.util.List"); assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().size() == 1; - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).isWildcardType(); + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .isWildcardType(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().annotations().size() == 1; - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().hasAnnotation(AnnTypeVariableClass13.class); + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().annotations().size() == 1; + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().hasAnnotation(AnnTypeVariableClass13.class); } - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().upperBound() != null; - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().isClass(); + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().upperBound() != null; + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().upperBound().isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().annotations().size() == 1; - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().hasAnnotation(AnnTypeVariableClass14.class); + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().upperBound().asClass().annotations().size() == 1; + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().upperBound().asClass().hasAnnotation(AnnTypeVariableClass14.class); } - assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().declaration().name().equals("java.lang.Number"); + assert clazz.typeParameters().get(5).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().upperBound().asClass().declaration().name().equals("java.lang.Number"); assertType(clazz.typeParameters().get(0), Type.Kind.TYPE_VARIABLE); assertType(clazz.typeParameters().get(1), Type.Kind.TYPE_VARIABLE); @@ -693,19 +706,22 @@ private static void verifyTypeVariableField(ClassInfo clazz) { assert field.type().asTypeVariable().bounds().size() == 1; assert field.type().asTypeVariable().bounds().get(0).isTypeVariable(); // JDK 11 and JDK 17, when accessed through reflection, disagree on annotations declared on generic bounds; TCK accepts both variants - Collection annotationInfos = field.type().asTypeVariable().bounds().get(0).asTypeVariable().annotations(); + Collection annotationInfos = field.type().asTypeVariable().bounds().get(0).asTypeVariable() + .annotations(); assert annotationInfos.isEmpty() || annotationInfos.size() == 1; // JDK 11 reflection doesn't see any annotation if (annotationInfos.size() == 1) { // JDK 17 reflection correctly recognizes one annotation if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert field.type().asTypeVariable().bounds().get(0).asTypeVariable().hasAnnotation(AnnTypeVariableClass3.class); + assert field.type().asTypeVariable().bounds().get(0).asTypeVariable() + .hasAnnotation(AnnTypeVariableClass3.class); } } assert field.type().asTypeVariable().bounds().get(0).asTypeVariable().name().equals("A"); assert field.type().asTypeVariable().bounds().get(0).asTypeVariable().bounds().size() == 1; assert field.type().asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).isClass(); assert field.type().asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().annotations().isEmpty(); - assert field.type().asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Object"); + assert field.type().asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name() + .equals("java.lang.Object"); assertType(field.type(), Type.Kind.TYPE_VARIABLE); } @@ -731,7 +747,8 @@ private static void verifyTypeVariableMethod(ClassInfo clazz, boolean reflection assert method.typeParameters().get(0).asTypeVariable().name().equals("T"); assert method.typeParameters().get(0).asTypeVariable().bounds().size() == 1; assert method.typeParameters().get(0).asTypeVariable().bounds().get(0).isClass(); - assert method.typeParameters().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Object"); + assert method.typeParameters().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name() + .equals("java.lang.Object"); // @AnnTypeVariableMethod2 U extends @AnnTypeVariableMethod3 C assert method.typeParameters().get(1).isTypeVariable(); @@ -742,16 +759,20 @@ private static void verifyTypeVariableMethod(ClassInfo clazz, boolean reflection assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).isTypeVariable(); if (!reflectionBug && LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().annotations().size() == 1; - assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().hasAnnotation(AnnTypeVariableMethod3.class); + assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable() + .hasAnnotation(AnnTypeVariableMethod3.class); } assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().name().equals("C"); assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().size() == 1; assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().annotations().size() == 1; - assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().hasAnnotation(AnnTypeVariableClass5.class); + assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass() + .annotations().size() == 1; + assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass() + .hasAnnotation(AnnTypeVariableClass5.class); } - assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Number"); + assert method.typeParameters().get(1).asTypeVariable().bounds().get(0).asTypeVariable().bounds().get(0).asClass() + .declaration().name().equals("java.lang.Number"); // @AnnTypeVariableMethod4 V extends @AnnTypeVariableMethod5 Number assert method.typeParameters().get(2).isTypeVariable(); @@ -762,10 +783,12 @@ private static void verifyTypeVariableMethod(ClassInfo clazz, boolean reflection assert method.typeParameters().get(2).asTypeVariable().bounds().get(0).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert method.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().annotations().size() == 1; - assert method.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().hasAnnotation(AnnTypeVariableMethod5.class); + assert method.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass() + .hasAnnotation(AnnTypeVariableMethod5.class); } assert method.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().declaration().isPlainClass(); - assert method.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Number"); + assert method.typeParameters().get(2).asTypeVariable().bounds().get(0).asClass().declaration().name() + .equals("java.lang.Number"); // @AnnTypeVariableMethod6 W extends @AnnTypeVariableMethod7 Number & @AnnTypeVariableMethod8 CharSequence assert method.typeParameters().get(3).isTypeVariable(); @@ -776,17 +799,21 @@ private static void verifyTypeVariableMethod(ClassInfo clazz, boolean reflection assert method.typeParameters().get(3).asTypeVariable().bounds().get(0).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert method.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().annotations().size() == 1; - assert method.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().hasAnnotation(AnnTypeVariableMethod7.class); + assert method.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass() + .hasAnnotation(AnnTypeVariableMethod7.class); } assert method.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().declaration().isPlainClass(); - assert method.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().declaration().name().equals("java.lang.Number"); + assert method.typeParameters().get(3).asTypeVariable().bounds().get(0).asClass().declaration().name() + .equals("java.lang.Number"); assert method.typeParameters().get(3).asTypeVariable().bounds().get(1).isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { assert method.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().annotations().size() == 1; - assert method.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().hasAnnotation(AnnTypeVariableMethod8.class); + assert method.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass() + .hasAnnotation(AnnTypeVariableMethod8.class); } assert method.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().declaration().isInterface(); - assert method.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().declaration().name().equals("java.lang.CharSequence"); + assert method.typeParameters().get(3).asTypeVariable().bounds().get(1).asClass().declaration().name() + .equals("java.lang.CharSequence"); // @AnnTypeVariableMethod9 X extends @AnnTypeVariableMethod10 List<@AnnTypeVariableMethod11 ? super @AnnTypeVariableMethod12 String> assert method.typeParameters().get(4).isTypeVariable(); @@ -796,25 +823,39 @@ private static void verifyTypeVariableMethod(ClassInfo clazz, boolean reflection assert method.typeParameters().get(4).asTypeVariable().bounds().size() == 1; assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).isParameterizedType(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().annotations().size() == 1; - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().hasAnnotation(AnnTypeVariableMethod10.class); - } - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().declaration().isInterface(); - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().declaration().name().equals("java.util.List"); - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().size() == 1; - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).isWildcardType(); - if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().annotations().size() == 1; - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().hasAnnotation(AnnTypeVariableMethod11.class); - } - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound() != null; - if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().annotations().size() == 1; - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().hasAnnotation(AnnTypeVariableMethod12.class); - } - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().isClass(); - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass().declaration().isPlainClass(); - assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass().declaration().name().equals("java.lang.String"); + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().annotations() + .size() == 1; + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType() + .hasAnnotation(AnnTypeVariableMethod10.class); + } + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().declaration() + .isInterface(); + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().declaration().name() + .equals("java.util.List"); + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments() + .size() == 1; + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .isWildcardType(); + if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().annotations().size() == 1; + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().hasAnnotation(AnnTypeVariableMethod11.class); + } + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().lowerBound() != null; + if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().lowerBound().annotations().size() == 1; + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().lowerBound().hasAnnotation(AnnTypeVariableMethod12.class); + } + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().lowerBound().isClass(); + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().lowerBound().asClass().declaration().isPlainClass(); + assert method.typeParameters().get(4).asTypeVariable().bounds().get(0).asParameterizedType().typeArguments().get(0) + .asWildcardType().lowerBound().asClass().declaration().name().equals("java.lang.String"); assertType(method.typeParameters().get(0), Type.Kind.TYPE_VARIABLE); assertType(method.typeParameters().get(1), Type.Kind.TYPE_VARIABLE); @@ -848,10 +889,13 @@ private static void verifyWildcardMethod(ClassInfo clazz) { assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound() != null; assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().isTypeVariable(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asTypeVariable().annotations().size() == 1; - assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asTypeVariable().hasAnnotation(AnnWildcardMethod2.class); + assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asTypeVariable() + .annotations().size() == 1; + assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asTypeVariable() + .hasAnnotation(AnnWildcardMethod2.class); } - assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asTypeVariable().name().equals("D"); + assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asTypeVariable().name() + .equals("D"); assert param1.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound() == null; // List<@AnnWildcardMethod3 ? super @AnnWildcardMethod4 String> @@ -867,10 +911,13 @@ private static void verifyWildcardMethod(ClassInfo clazz) { assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound() != null; assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass().annotations().size() == 1; - assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass().hasAnnotation(AnnWildcardMethod4.class); + assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass().annotations() + .size() == 1; + assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass() + .hasAnnotation(AnnWildcardMethod4.class); } - assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass().declaration().name().equals("java.lang.String"); + assert param2.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound().asClass().declaration().name() + .equals("java.lang.String"); // List<@AnnWildcardMethod5 ?> Type param3 = method.parameters().get(2).type(); @@ -883,8 +930,10 @@ private static void verifyWildcardMethod(ClassInfo clazz) { } assert param3.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound() != null; assert param3.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().isClass(); - assert param3.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().annotations().isEmpty(); - assert param3.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().declaration().name().equals("java.lang.Object"); + assert param3.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().annotations() + .isEmpty(); + assert param3.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().declaration().name() + .equals("java.lang.Object"); assert param3.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound() == null; // List<@AnnWildcardMethod6 ? extends @AnnWildcardMethod7 Object> p4 @@ -899,10 +948,13 @@ private static void verifyWildcardMethod(ClassInfo clazz) { assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound() != null; assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().isClass(); if (LangModelVerifier.RUN_TYPE_ANNOTATION_TESTS) { - assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().annotations().size() == 1; - assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().hasAnnotation(AnnWildcardMethod7.class); + assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().annotations() + .size() == 1; + assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass() + .hasAnnotation(AnnWildcardMethod7.class); } - assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().declaration().name().equals("java.lang.Object"); + assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().upperBound().asClass().declaration().name() + .equals("java.lang.Object"); assert param4.asParameterizedType().typeArguments().get(0).asWildcardType().lowerBound() == null; assertType(method.parameters().get(0).type().asParameterizedType().typeArguments().get(0), Type.Kind.WILDCARD_TYPE); diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationInstances.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationInstances.java index 32dbcba467..3fd98b73f4 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationInstances.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationInstances.java @@ -22,33 +22,15 @@ public class AnnotationInstances { void defaultValues() { } - @AnnotationMembers( - booleanMember = false, - byteMember = -1, - shortMember = -2, - intMember = -3, - longMember = -4, - floatMember = -5.0F, - doubleMember = -6.0, - charMember = 'a', - stringMember = "bb", - classMember = AnnotationInstances.class, - enumMember = SimpleEnum.NO, - annotationMember = @SimpleAnnotation("ccc"), - - booleanArrayMember = { false, true }, - byteArrayMember = { -1, -2 }, - shortArrayMember = { -3, -4 }, - intArrayMember = { -5, -6 }, - longArrayMember = { -7, -8 }, - floatArrayMember = { -9.0F, -10.0F }, - doubleArrayMember = { -11.0, -12.0 }, - charArrayMember = { 'a', 'b' }, - stringArrayMember = { "cc", "dd" }, - classArrayMember = { AnnotationInstances.class, AnnotationMembers.class }, - enumArrayMember = { SimpleEnum.NO, SimpleEnum.YES }, - annotationArrayMember = { @SimpleAnnotation("eee"), @SimpleAnnotation("fff") } - ) + @AnnotationMembers(booleanMember = false, byteMember = -1, shortMember = -2, intMember = -3, longMember = -4, floatMember = -5.0F, doubleMember = -6.0, charMember = 'a', stringMember = "bb", classMember = AnnotationInstances.class, enumMember = SimpleEnum.NO, annotationMember = @SimpleAnnotation("ccc"), + + booleanArrayMember = { false, true }, byteArrayMember = { -1, -2 }, shortArrayMember = { -3, + -4 }, intArrayMember = { -5, -6 }, longArrayMember = { -7, -8 }, floatArrayMember = { -9.0F, + -10.0F }, doubleArrayMember = { -11.0, -12.0 }, charArrayMember = { 'a', + 'b' }, stringArrayMember = { "cc", "dd" }, classArrayMember = { AnnotationInstances.class, + AnnotationMembers.class }, enumArrayMember = { SimpleEnum.NO, + SimpleEnum.YES }, annotationArrayMember = { @SimpleAnnotation("eee"), + @SimpleAnnotation("fff") }) void nondefaultValues() { } @@ -60,8 +42,10 @@ public static void verify(ClassInfo clazz) { private static void verifyDefaultValues(ClassInfo clazz) { MethodInfo method = LangModelUtils.singleMethod(clazz, "defaultValues"); assert method.annotations().size() == 1; - assert method.annotations(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")).size() == 1; - assert method.annotations(it -> !it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")).size() == 0; + assert method.annotations(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")) + .size() == 1; + assert method.annotations(it -> !it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")) + .size() == 0; assert method.hasAnnotation(AnnotationMembers.class); assert method.hasAnnotation(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")); assert !method.hasAnnotation(it -> !it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")); @@ -117,7 +101,8 @@ private static void verifyDefaultValues(ClassInfo clazz) { assert ann.hasMember("classMember"); assert ann.member("classMember").isClass(); assert ann.member("classMember").asType().isClass(); - assert ann.member("classMember").asType().asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers"); + assert ann.member("classMember").asType().asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.AnnotationMembers"); // SimpleEnum enumMember() default SimpleEnum.YES; assert ann.hasMember("enumMember"); @@ -129,7 +114,8 @@ private static void verifyDefaultValues(ClassInfo clazz) { // SimpleAnnotation annotationMember() default @SimpleAnnotation("CCC"); assert ann.hasMember("annotationMember"); assert ann.member("annotationMember").isNestedAnnotation(); - assert ann.member("annotationMember").asNestedAnnotation().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); + assert ann.member("annotationMember").asNestedAnnotation().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); assert ann.member("annotationMember").asNestedAnnotation().hasValue(); assert ann.member("annotationMember").asNestedAnnotation().value().isString(); assert ann.member("annotationMember").asNestedAnnotation().value().asString().equals("CCC"); @@ -221,10 +207,12 @@ private static void verifyDefaultValues(ClassInfo clazz) { assert ann.member("classArrayMember").asArray().size() == 2; assert ann.member("classArrayMember").asArray().get(0).isClass(); assert ann.member("classArrayMember").asArray().get(0).asType().isClass(); - assert ann.member("classArrayMember").asArray().get(0).asType().asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); + assert ann.member("classArrayMember").asArray().get(0).asType().asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); assert ann.member("classArrayMember").asArray().get(1).isClass(); assert ann.member("classArrayMember").asArray().get(1).asType().isClass(); - assert ann.member("classArrayMember").asArray().get(1).asType().asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleEnum"); + assert ann.member("classArrayMember").asArray().get(1).asType().asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleEnum"); // SimpleEnum[] enumArrayMember() default { SimpleEnum.YES, SimpleEnum.NO }; assert ann.hasMember("enumArrayMember"); @@ -233,7 +221,8 @@ private static void verifyDefaultValues(ClassInfo clazz) { assert ann.member("enumArrayMember").asArray().get(0).isEnum(); assert ann.member("enumArrayMember").asArray().get(0).asEnum(SimpleEnum.class) == SimpleEnum.YES; assert ann.member("enumArrayMember").asArray().get(1).isEnum(); - assert ann.member("enumArrayMember").asArray().get(1).asEnumClass().name().equals("org.jboss.cdi.lang.model.tck.SimpleEnum"); + assert ann.member("enumArrayMember").asArray().get(1).asEnumClass().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleEnum"); assert ann.member("enumArrayMember").asArray().get(1).asEnumConstant().equals("NO"); // SimpleAnnotation[] annotationArrayMember() default { @SimpleAnnotation("EEE"), @SimpleAnnotation("FFF") }; @@ -241,12 +230,14 @@ private static void verifyDefaultValues(ClassInfo clazz) { assert ann.member("annotationArrayMember").isArray(); assert ann.member("annotationArrayMember").asArray().size() == 2; assert ann.member("annotationArrayMember").asArray().get(0).isNestedAnnotation(); - assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); + assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().hasValue(); assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().value().isString(); assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().value().asString().equals("EEE"); assert ann.member("annotationArrayMember").asArray().get(1).isNestedAnnotation(); - assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); + assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().hasValue(); assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().value().isString(); assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().value().asString().equals("FFF"); @@ -255,8 +246,10 @@ private static void verifyDefaultValues(ClassInfo clazz) { private static void verifyNondefaultValues(ClassInfo clazz) { MethodInfo method = LangModelUtils.singleMethod(clazz, "nondefaultValues"); assert method.annotations().size() == 1; - assert method.annotations(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")).size() == 1; - assert method.annotations(it -> !it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")).size() == 0; + assert method.annotations(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")) + .size() == 1; + assert method.annotations(it -> !it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")) + .size() == 0; assert method.hasAnnotation(AnnotationMembers.class); assert method.hasAnnotation(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")); assert !method.hasAnnotation(it -> !it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers")); @@ -312,7 +305,8 @@ private static void verifyNondefaultValues(ClassInfo clazz) { assert ann.hasMember("classMember"); assert ann.member("classMember").isClass(); assert ann.member("classMember").asType().isClass(); - assert ann.member("classMember").asType().asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationInstances"); + assert ann.member("classMember").asType().asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.AnnotationInstances"); // enumMember = SimpleEnum.NO assert ann.hasMember("enumMember"); @@ -324,7 +318,8 @@ private static void verifyNondefaultValues(ClassInfo clazz) { // annotationMember = @SimpleAnnotation("ccc"), assert ann.hasMember("annotationMember"); assert ann.member("annotationMember").isNestedAnnotation(); - assert ann.member("annotationMember").asNestedAnnotation().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); + assert ann.member("annotationMember").asNestedAnnotation().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); assert ann.member("annotationMember").asNestedAnnotation().hasValue(); assert ann.member("annotationMember").asNestedAnnotation().value().isString(); assert ann.member("annotationMember").asNestedAnnotation().value().asString().equals("ccc"); @@ -416,10 +411,12 @@ private static void verifyNondefaultValues(ClassInfo clazz) { assert ann.member("classArrayMember").asArray().size() == 2; assert ann.member("classArrayMember").asArray().get(0).isClass(); assert ann.member("classArrayMember").asArray().get(0).asType().isClass(); - assert ann.member("classArrayMember").asArray().get(0).asType().asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationInstances"); + assert ann.member("classArrayMember").asArray().get(0).asType().asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.AnnotationInstances"); assert ann.member("classArrayMember").asArray().get(1).isClass(); assert ann.member("classArrayMember").asArray().get(1).asType().isClass(); - assert ann.member("classArrayMember").asArray().get(1).asType().asClass().declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnotationMembers"); + assert ann.member("classArrayMember").asArray().get(1).asType().asClass().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.AnnotationMembers"); // enumArrayMember = { SimpleEnum.NO, SimpleEnum.YES } assert ann.hasMember("enumArrayMember"); @@ -428,7 +425,8 @@ private static void verifyNondefaultValues(ClassInfo clazz) { assert ann.member("enumArrayMember").asArray().get(0).isEnum(); assert ann.member("enumArrayMember").asArray().get(0).asEnum(SimpleEnum.class) == SimpleEnum.NO; assert ann.member("enumArrayMember").asArray().get(1).isEnum(); - assert ann.member("enumArrayMember").asArray().get(1).asEnumClass().name().equals("org.jboss.cdi.lang.model.tck.SimpleEnum"); + assert ann.member("enumArrayMember").asArray().get(1).asEnumClass().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleEnum"); assert ann.member("enumArrayMember").asArray().get(1).asEnumConstant().equals("YES"); /// annotationArrayMember = { @SimpleAnnotation("eee"), @SimpleAnnotation("fff") } @@ -436,12 +434,14 @@ private static void verifyNondefaultValues(ClassInfo clazz) { assert ann.member("annotationArrayMember").isArray(); assert ann.member("annotationArrayMember").asArray().size() == 2; assert ann.member("annotationArrayMember").asArray().get(0).isNestedAnnotation(); - assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); + assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().hasValue(); assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().value().isString(); assert ann.member("annotationArrayMember").asArray().get(0).asNestedAnnotation().value().asString().equals("eee"); assert ann.member("annotationArrayMember").asArray().get(1).isNestedAnnotation(); - assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().declaration().name().equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); + assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().declaration().name() + .equals("org.jboss.cdi.lang.model.tck.SimpleAnnotation"); assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().hasValue(); assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().value().isString(); assert ann.member("annotationArrayMember").asArray().get(1).asNestedAnnotation().value().asString().equals("fff"); diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationMembers.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationMembers.java index a1911d3b48..e7af560e7f 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationMembers.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/AnnotationMembers.java @@ -13,13 +13,13 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; +import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertField; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Modifier; -import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertField; +import jakarta.enterprise.lang.model.declarations.ClassInfo; @Retention(RetentionPolicy.RUNTIME) public @interface AnnotationMembers { @@ -38,29 +38,51 @@ // methods boolean booleanMember() default true; + byte byteMember() default 1; + short shortMember() default 2; + int intMember() default 3; + long longMember() default 4; + float floatMember() default 5.0F; + double doubleMember() default 6.0; + char charMember() default 'A'; + String stringMember() default "BB"; + Class classMember() default AnnotationMembers.class; + SimpleEnum enumMember() default SimpleEnum.YES; + SimpleAnnotation annotationMember() default @SimpleAnnotation("CCC"); boolean[] booleanArrayMember() default { true, false }; + byte[] byteArrayMember() default { 1, 2 }; + short[] shortArrayMember() default { 3, 4 }; + int[] intArrayMember() default { 5, 6 }; + long[] longArrayMember() default { 7, 8 }; + float[] floatArrayMember() default { 9.0F, 10.0F }; + double[] doubleArrayMember() default { 11.0, 12.0 }; + char[] charArrayMember() default { 'A', 'B' }; + String[] stringArrayMember() default { "CC", "DD" }; + Class[] classArrayMember() default { SimpleAnnotation.class, SimpleEnum.class }; + SimpleEnum[] enumArrayMember() default { SimpleEnum.YES, SimpleEnum.NO }; + SimpleAnnotation[] annotationArrayMember() default { @SimpleAnnotation("EEE"), @SimpleAnnotation("FFF") }; class Verifier { diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/EnumMembers.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/EnumMembers.java index 4620a60ee2..1b4cbc66ce 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/EnumMembers.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/EnumMembers.java @@ -13,10 +13,9 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.declarations.FieldInfo; -import jakarta.enterprise.lang.model.declarations.MethodInfo; -import jakarta.enterprise.lang.model.types.PrimitiveType; +import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertConstructor; +import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertField; +import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertMethod; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; @@ -25,9 +24,10 @@ import java.lang.annotation.Target; import java.lang.reflect.Modifier; -import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertConstructor; -import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertField; -import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertMethod; +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.declarations.FieldInfo; +import jakarta.enterprise.lang.model.declarations.MethodInfo; +import jakarta.enterprise.lang.model.types.PrimitiveType; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) @@ -40,34 +40,34 @@ } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnEnumConstructor1 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnEnumConstructor2 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnEnumConstructor3 { } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnEnumConstructor4 { } @Repeatable(AnnEnumConstructorRepeatableContainer.class) @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnEnumConstructorRepeatable { String value(); } @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE}) +@Target({ ElementType.CONSTRUCTOR, ElementType.PARAMETER, ElementType.TYPE_USE }) @interface AnnEnumConstructorRepeatableContainer { AnnEnumConstructorRepeatable[] value(); } @@ -147,36 +147,70 @@ protected void protectedAbstractMethod() { // methods - public static final void publicStaticFinalMethod() {} - public static void publicStaticMethod() {} - public final void publicFinalMethod() {} - public void publicMethod() {} + public static final void publicStaticFinalMethod() { + } + + public static void publicStaticMethod() { + } + + public final void publicFinalMethod() { + } + + public void publicMethod() { + } - protected static final void protectedStaticFinalMethod() {} - protected static void protectedStaticMethod() {} - protected final void protectedFinalMethod() {} - protected void protectedMethod() {} + protected static final void protectedStaticFinalMethod() { + } - static final void packagePrivateStaticFinalMethod() {} - static void packagePrivateStaticMethod() {} - final void packagePrivateFinalMethod() {} - void packagePrivateMethod() {} + protected static void protectedStaticMethod() { + } - private static final void privateStaticFinalMethod() {} - private static void privateStaticMethod() {} - private final void privateFinalMethod() {} - private void privateMethod() {} + protected final void protectedFinalMethod() { + } + + protected void protectedMethod() { + } + + static final void packagePrivateStaticFinalMethod() { + } + + static void packagePrivateStaticMethod() { + } + + final void packagePrivateFinalMethod() { + } + + void packagePrivateMethod() { + } + + private static final void privateStaticFinalMethod() { + } + + private static void privateStaticMethod() { + } + + private final void privateFinalMethod() { + } + + private void privateMethod() { + } public abstract void publicAbstractMethod(); + protected abstract void protectedAbstractMethod(); + abstract void packagePrivateAbstractMethod(); // constructors @AnnEnumConstructor1 - EnumMembers(@AnnEnumConstructor2 @AnnEnumConstructorRepeatable("foo") boolean disambiguate) {} + EnumMembers(@AnnEnumConstructor2 @AnnEnumConstructorRepeatable("foo") boolean disambiguate) { + } + @AnnEnumConstructor3 - private EnumMembers(@AnnEnumConstructor4 @AnnEnumConstructorRepeatable("bar") @AnnEnumConstructorRepeatable("baz") int disambiguate) {} + private EnumMembers( + @AnnEnumConstructor4 @AnnEnumConstructorRepeatable("bar") @AnnEnumConstructorRepeatable("baz") int disambiguate) { + } // inherited @@ -301,7 +335,8 @@ private static void verifyConstructors(ClassInfo clazz) { // EnumMembers(@AnnEnumConstructor2 @AnnEnumConstructorRepeatable("foo") boolean disambiguate) {} MethodInfo ctor = clazz.constructors() .stream() - .filter(it -> it.parameters().get(0).type().asPrimitive().primitiveKind() == PrimitiveType.PrimitiveKind.BOOLEAN) + .filter(it -> it.parameters().get(0).type().asPrimitive() + .primitiveKind() == PrimitiveType.PrimitiveKind.BOOLEAN) .findAny() .get(); assert ctor.annotations().size() == 1; @@ -325,7 +360,8 @@ private static void verifyConstructors(ClassInfo clazz) { // private EnumMembers(@AnnEnumConstructor4 @AnnEnumConstructorRepeatable("bar") @AnnEnumConstructorRepeatable("baz") int disambiguate) {} MethodInfo ctor2 = clazz.constructors() .stream() - .filter(it -> it.parameters().get(0).type().asPrimitive().primitiveKind() == PrimitiveType.PrimitiveKind.INT) + .filter(it -> it.parameters().get(0).type().asPrimitive() + .primitiveKind() == PrimitiveType.PrimitiveKind.INT) .findAny() .get(); assert ctor2.annotations().size() == 1; diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/Equality.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/Equality.java index 038fa05149..179a432ac8 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/Equality.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/Equality.java @@ -93,12 +93,15 @@ private static void verifyTypes(ClassInfo clazz) { assertInequality(simpleAnnotation, simpleInterface); assertInequality(simpleAnnotation, simpleEnum); - Type simpleMethod = LangModelUtils.singleDeclaredMethod(simpleClass.asClass().declaration(), "simpleMethod").returnType(); - Type anotherMethod = LangModelUtils.singleDeclaredMethod(simpleClass.asClass().declaration(), "anotherMethod").returnType(); + Type simpleMethod = LangModelUtils.singleDeclaredMethod(simpleClass.asClass().declaration(), "simpleMethod") + .returnType(); + Type anotherMethod = LangModelUtils.singleDeclaredMethod(simpleClass.asClass().declaration(), "anotherMethod") + .returnType(); assertEquality(simpleMethod, anotherMethod); assertEquality(anotherMethod, simpleMethod); - Type simpleStaticField = LangModelUtils.singleDeclaredField(simpleClass.asClass().declaration(), "simpleStaticField").type(); + Type simpleStaticField = LangModelUtils.singleDeclaredField(simpleClass.asClass().declaration(), "simpleStaticField") + .type(); Type simpleField = LangModelUtils.singleDeclaredField(simpleClass.asClass().declaration(), "simpleField").type(); assertEquality(simpleStaticField, simpleField); assertEquality(simpleField, simpleStaticField); diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InheritedAnnotations.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InheritedAnnotations.java index 1e24eab35a..f672e0c594 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InheritedAnnotations.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InheritedAnnotations.java @@ -13,16 +13,13 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.declarations.MethodInfo; - import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.List; + +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.declarations.MethodInfo; @Inherited @Retention(RetentionPolicy.RUNTIME) diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InterfaceMembers.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InterfaceMembers.java index d6d30e3692..d4dfce4926 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InterfaceMembers.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/InterfaceMembers.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; +import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertField; +import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertMethod; import java.lang.reflect.Modifier; -import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertField; -import static org.jboss.cdi.lang.model.tck.PlainClassMembers.Verifier.assertMethod; +import jakarta.enterprise.lang.model.declarations.ClassInfo; public interface InterfaceMembers { public static final String publicStaticFinalField = ""; @@ -31,17 +31,27 @@ public interface InterfaceMembers { final String finalField = ""; String field = ""; - public static void publicStaticMethod() {} - static void staticMethod() {} - private static void privateStaticMethod() {} + public static void publicStaticMethod() { + } + + static void staticMethod() { + } + + private static void privateStaticMethod() { + } public void publicAbstractMethod(); + void abstractMethod(); - public default void publicDefaultMethod() {} - default void defaultMethod() {} + public default void publicDefaultMethod() { + } + + default void defaultMethod() { + } - private void privateMethod() {} + private void privateMethod() { + } class Verifier { public static void verify(ClassInfo clazz) { diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/JavaLangObjectMethods.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/JavaLangObjectMethods.java index ccd0e02ff6..f8f9e97ffc 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/JavaLangObjectMethods.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/JavaLangObjectMethods.java @@ -15,7 +15,7 @@ import jakarta.enterprise.lang.model.declarations.ClassInfo; -public class JavaLangObjectMethods /*extends Object*/ { +public class JavaLangObjectMethods /* extends Object */ { public static class Verifier { public static void verify(ClassInfo clazz) { assert clazz.methods().isEmpty(); diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelUtils.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelUtils.java index 915ce8612d..b250d45f1f 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelUtils.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelUtils.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.declarations.FieldInfo; -import jakarta.enterprise.lang.model.declarations.MethodInfo; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.declarations.FieldInfo; +import jakarta.enterprise.lang.model.declarations.MethodInfo; + class LangModelUtils { static ClassInfo classOfField(ClassInfo clazz, String fieldName) { return singleField(clazz, fieldName).type().asClass().declaration(); @@ -33,7 +33,8 @@ static FieldInfo singleField(ClassInfo clazz, String name) { if (result == null) { result = field; } else { - throw new IllegalStateException("More than 1 declaration of field '" + name + "' on '" + clazz.simpleName() + "'"); + throw new IllegalStateException( + "More than 1 declaration of field '" + name + "' on '" + clazz.simpleName() + "'"); } } } @@ -54,7 +55,8 @@ static FieldInfo singleDeclaredField(ClassInfo clazz, String name) { if (result == null) { result = field; } else { - throw new IllegalStateException("More than 1 declaration of field '" + name + "' on '" + clazz.simpleName() + "'"); + throw new IllegalStateException( + "More than 1 declaration of field '" + name + "' on '" + clazz.simpleName() + "'"); } } } @@ -81,7 +83,8 @@ static MethodInfo singleMethod(ClassInfo clazz, String name) { if (result == null) { result = method; } else { - throw new IllegalStateException("More than 1 declaration of method '" + name + "' on '" + clazz.simpleName() + "'"); + throw new IllegalStateException( + "More than 1 declaration of method '" + name + "' on '" + clazz.simpleName() + "'"); } } } @@ -102,7 +105,8 @@ static MethodInfo singleDeclaredMethod(ClassInfo clazz, String name) { if (result == null) { result = method; } else { - throw new IllegalStateException("More than 1 declaration of method '" + name + "' on '" + clazz.simpleName() + "'"); + throw new IllegalStateException( + "More than 1 declaration of method '" + name + "' on '" + clazz.simpleName() + "'"); } } } diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelVerifier.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelVerifier.java index 80d774959d..6c917280e4 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelVerifier.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/LangModelVerifier.java @@ -13,12 +13,12 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.declarations.ClassInfo; -import jakarta.enterprise.lang.model.declarations.PackageInfo; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import jakarta.enterprise.lang.model.declarations.ClassInfo; +import jakarta.enterprise.lang.model.declarations.PackageInfo; + @Retention(RetentionPolicy.SOURCE) @interface SourceAnnotation { } diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/PlainClassMembers.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/PlainClassMembers.java index 87d00c1320..f864284f7c 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/PlainClassMembers.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/PlainClassMembers.java @@ -13,14 +13,14 @@ */ package org.jboss.cdi.lang.model.tck; +import java.lang.reflect.Modifier; + import jakarta.enterprise.lang.model.declarations.ClassInfo; import jakarta.enterprise.lang.model.declarations.FieldInfo; import jakarta.enterprise.lang.model.declarations.MethodInfo; import jakarta.enterprise.lang.model.types.PrimitiveType; import jakarta.enterprise.lang.model.types.Type; -import java.lang.reflect.Modifier; - abstract class PlainAbstractClass { PlainAbstractClass(boolean disambiguate) { } @@ -56,37 +56,68 @@ public final class PlainClassMembers extends PlainAbstractClass { // methods - public static final void publicStaticFinalMethod() {} - public static void publicStaticMethod() {} - public final void publicFinalMethod() {} - public void publicMethod() {} + public static final void publicStaticFinalMethod() { + } + + public static void publicStaticMethod() { + } + + public final void publicFinalMethod() { + } + + public void publicMethod() { + } - protected static final void protectedStaticFinalMethod() {} - protected static void protectedStaticMethod() {} - protected final void protectedFinalMethod() {} - protected void protectedMethod() {} + protected static final void protectedStaticFinalMethod() { + } - static final void packagePrivateStaticFinalMethod() {} - static void packagePrivateStaticMethod() {} - final void packagePrivateFinalMethod() {} - void packagePrivateMethod() {} + protected static void protectedStaticMethod() { + } - private static final void privateStaticFinalMethod() {} - private static void privateStaticMethod() {} - private final void privateFinalMethod() {} - private void privateMethod() {} + protected final void protectedFinalMethod() { + } + + protected void protectedMethod() { + } + + static final void packagePrivateStaticFinalMethod() { + } + + static void packagePrivateStaticMethod() { + } + + final void packagePrivateFinalMethod() { + } + + void packagePrivateMethod() { + } + + private static final void privateStaticFinalMethod() { + } + + private static void privateStaticMethod() { + } + + private final void privateFinalMethod() { + } + + private void privateMethod() { + } // constructors public PlainClassMembers(boolean disambiguate) { super(false); } + protected PlainClassMembers(int disambiguate) { super(false); } + PlainClassMembers(double disambiguate) { super(false); } + private PlainClassMembers(char disambiguate) { super(false); } @@ -152,7 +183,8 @@ private static void verifyFields(ClassInfo clazz) { assertField(clazz, "privateField", Modifier.PRIVATE, false, false, true); } - static void assertField(ClassInfo clazz, String name, int accesibility, boolean isStatic, boolean isFinal, boolean testStringType) { + static void assertField(ClassInfo clazz, String name, int accesibility, boolean isStatic, boolean isFinal, + boolean testStringType) { FieldInfo field = LangModelUtils.singleField(clazz, name); assert field.declaringClass().equals(clazz); @@ -199,7 +231,8 @@ private static void verifyMethods(ClassInfo clazz) { assertMethod(clazz, "privateMethod", Modifier.PRIVATE, false, false, false); } - static void assertMethod(ClassInfo clazz, String name, int accesibility, boolean isStatic, boolean isFinal, boolean isAbstract) { + static void assertMethod(ClassInfo clazz, String name, int accesibility, boolean isStatic, boolean isFinal, + boolean isAbstract) { MethodInfo method = LangModelUtils.singleMethod(clazz, name); assert method.declaringClass().equals(clazz); diff --git a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/RepeatableAnnotations.java b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/RepeatableAnnotations.java index 2823e7fc69..ff9f49b3db 100644 --- a/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/RepeatableAnnotations.java +++ b/lang-model/src/main/java/org/jboss/cdi/lang/model/tck/RepeatableAnnotations.java @@ -13,10 +13,6 @@ */ package org.jboss.cdi.lang.model.tck; -import jakarta.enterprise.lang.model.AnnotationInfo; -import jakarta.enterprise.lang.model.declarations.ClassInfo; - -import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; @@ -25,6 +21,9 @@ import java.util.Set; import java.util.stream.Collectors; +import jakarta.enterprise.lang.model.AnnotationInfo; +import jakarta.enterprise.lang.model.declarations.ClassInfo; + @Inherited @Repeatable(AnnRepeatableContainer.class) @Retention(RetentionPolicy.RUNTIME) @@ -89,7 +88,8 @@ public static void verify(ClassInfo clazz) { verifyInheritedRepeatableAnnotations(inheritedClass); verifyInheritedRepeatableAnnotations(inheritedClass.superClassDeclaration()); verifyInheritedRepeatableAnnotationsSuperSuperClass(inheritedClass.superClassDeclaration().superClassDeclaration()); - verifyInheritedRepeatableAnnotationsSuperSuperSuperClass(inheritedClass.superClassDeclaration().superClassDeclaration().superClassDeclaration()); + verifyInheritedRepeatableAnnotationsSuperSuperSuperClass( + inheritedClass.superClassDeclaration().superClassDeclaration().superClassDeclaration()); verifySingleRepeatableAnnotation(LangModelUtils.classOfField(clazz, "singleRepeatableAnnotation")); @@ -116,9 +116,12 @@ private static void verifyInheritedRepeatableAnnotations(ClassInfo clazz) { assert clazz.annotation(AnnRepeatableContainer.class) != null; assert clazz.annotation(AnnRepeatableContainer.class).value().isArray(); assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().size() == 3; - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString().equals("qux"); - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString().equals("quux"); - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(2).asNestedAnnotation().value().asString().equals("quuz"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString() + .equals("qux"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString() + .equals("quux"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(2).asNestedAnnotation().value().asString() + .equals("quuz"); assert clazz.annotation(AnnRepeatable.class) != null; assert clazz.annotation(AnnRepeatable.class).value().isString(); @@ -153,8 +156,10 @@ private static void verifyInheritedRepeatableAnnotationsSuperSuperClass(ClassInf assert clazz.annotation(AnnRepeatableContainer.class) != null; assert clazz.annotation(AnnRepeatableContainer.class).value().isArray(); assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().size() == 2; - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString().equals("foo"); - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString().equals("bar"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString() + .equals("foo"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString() + .equals("bar"); assert clazz.annotation(AnnRepeatable.class) != null; assert clazz.annotation(AnnRepeatable.class).value().isString(); @@ -187,8 +192,10 @@ private static void verifyInheritedRepeatableAnnotationsSuperSuperSuperClass(Cla assert clazz.annotation(AnnRepeatableContainer.class) != null; assert clazz.annotation(AnnRepeatableContainer.class).value().isArray(); assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().size() == 2; - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString().equals("foo"); - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString().equals("bar"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString() + .equals("foo"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString() + .equals("bar"); assert clazz.annotation(AnnRepeatable.class) == null; @@ -214,7 +221,8 @@ private static void verifySingleRepeatableAnnotation(ClassInfo clazz) { assert !clazz.hasAnnotation(AnnRepeatableContainer.class); assert clazz.hasAnnotation(AnnRepeatable.class); - assert !clazz.hasAnnotation(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnRepeatableContainer")); + assert !clazz + .hasAnnotation(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnRepeatableContainer")); assert clazz.hasAnnotation(it -> it.declaration().name().equals("org.jboss.cdi.lang.model.tck.AnnRepeatable")); assert clazz.annotation(AnnRepeatableContainer.class) == null; @@ -246,8 +254,10 @@ private static void verifyMixedRepeatableAnnotations(ClassInfo clazz) { assert clazz.annotation(AnnRepeatableContainer.class) != null; assert clazz.annotation(AnnRepeatableContainer.class).value().isArray(); assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().size() == 2; - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString().equals("b"); - assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString().equals("c"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(0).asNestedAnnotation().value().asString() + .equals("b"); + assert clazz.annotation(AnnRepeatableContainer.class).value().asArray().get(1).asNestedAnnotation().value().asString() + .equals("c"); assert clazz.annotation(AnnRepeatable.class) != null; assert clazz.annotation(AnnRepeatable.class).value().isString(); diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java index 2871951a56..78a02e4cd8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/aroundConstruct/ejb/SessionBeanConstructorInterceptionTest.java @@ -19,6 +19,7 @@ import static org.jboss.cdi.tck.util.ActionSequence.assertSequenceDataEquals; import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -44,7 +45,8 @@ public class SessionBeanConstructorInterceptionTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(SessionBeanConstructorInterceptionTest.class) - .withBeansXml(new BeansXml().interceptors(AlphaInterceptor1.class, AlphaInterceptor2.class, BravoInterceptor.class)) + .withBeansXml( + new BeansXml().interceptors(AlphaInterceptor1.class, AlphaInterceptor2.class, BravoInterceptor.class)) .build(); } @@ -71,7 +73,8 @@ public void testTypeLevelBinding(Instance instance) { public void testTypeLevelAndConstructorLevelBinding(Instance instance) { ActionSequence.reset(); instance.get(); - assertSequenceDataEquals(AlphaInterceptor1.class, BravoInterceptor.class, BeanWithConstructorLevelAndTypeLevelBinding.class); + assertSequenceDataEquals(AlphaInterceptor1.class, BravoInterceptor.class, + BeanWithConstructorLevelAndTypeLevelBinding.class); } @Test(groups = INTEGRATION, dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBinding.java index f749298d84..614146f8af 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBindingLiteral.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBindingLiteral.java index 8048c12b06..fb3f0079ac 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBindingLiteral.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BallBindingLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBinding.java index 844fc41731..4f8ce7f625 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBindingLiteral.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBindingLiteral.java index 857f121b1e..3277b84e4f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBindingLiteral.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/BasketBindingLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedInterceptor.java index 93dc857c6c..1a5b2cc4c7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedLifecycleInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedLifecycleInterceptor.java index f39a349147..6097edc64c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedLifecycleInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ComplicatedLifecycleInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 76bd94ba1d..8b60eea6b3 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 @@ -22,10 +22,12 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.util.concurrent.TimeUnit; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.InterceptionType; -import jakarta.enterprise.util.AnnotationLiteral; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -37,8 +39,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.concurrent.TimeUnit; - /** * Interceptor resolution test. * @@ -73,7 +73,8 @@ public void testBusinessMethodInterceptorBindings(MessageService messageService, new TransactionalBinding.Literal(), new PingBinding.Literal(), new PongBinding.Literal(), - new BallBindingLiteral(true, true)).size(), 1); + new BallBindingLiteral(true, true)).size(), + 1); // Test the set of interceptor bindings assertNotNull(messageService); @@ -115,12 +116,14 @@ public void testLifecycleInterceptorBindings() throws Exception { new MessageBinding.Literal(), new LoggedBinding.Literal(), new TransactionalBinding.Literal(), - new BasketBindingLiteral(true, true)).size(), 1); + new BasketBindingLiteral(true, true)).size(), + 1); assertEquals( getCurrentManager().resolveInterceptors(InterceptionType.PRE_DESTROY, new MessageBinding.Literal(), - new LoggedBinding.Literal(), - new TransactionalBinding.Literal(), - new BasketBindingLiteral(true, true)).size(), 1); + 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 66fbbb7c2d..7861b6053b 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 bf4c97ebce..9192b8b21f 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d1258a0667..6fb538a993 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 1ca1f4ab2e..9216d44e88 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ServiceStereotype.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ServiceStereotype.java index f840444b2c..07fb473f54 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ServiceStereotype.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/bindings/resolution/ejb/ServiceStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 c64ca52ff2..7aeefe2503 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/ejb/Binding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/ejb/Binding.java index ea287a9a8a..ee9f20098a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/ejb/Binding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/bindings/ejb/Binding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/AroundInvokeAccessInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/AroundInvokeAccessInterceptorTest.java index 1cd2ada4bf..e840bc8e02 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/AroundInvokeAccessInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/AroundInvokeAccessInterceptorTest.java @@ -13,7 +13,13 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundInvoke.ee; +import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; +import static org.jboss.cdi.tck.TestGroups.SECURITY; +import static org.jboss.cdi.tck.interceptors.InterceptorsSections.BUSINESS_METHOD_INTERCEPTOR_METHODS; +import static org.testng.Assert.assertTrue; + import jakarta.transaction.UserTransaction; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -24,12 +30,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; -import static org.jboss.cdi.tck.TestGroups.SECURITY; -import static org.jboss.cdi.tck.interceptors.InterceptorsSections.BUSINESS_METHOD_INTERCEPTOR_METHODS; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "interceptors", version = "1.2") public class AroundInvokeAccessInterceptorTest extends AbstractTest { @@ -41,8 +41,7 @@ public static WebArchive createTestArchive() { .build(); } - - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = {JAVAEE_FULL, SECURITY}) + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = { JAVAEE_FULL, SECURITY }) @SpecAssertion(section = BUSINESS_METHOD_INTERCEPTOR_METHODS, id = "e") @SpecAssertion(section = BUSINESS_METHOD_INTERCEPTOR_METHODS, id = "fb") public void testSecurityContext(Student student) throws Exception { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/Baz.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/Baz.java index f777c67653..cc0573829b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/Baz.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/Baz.java @@ -15,9 +15,11 @@ import static org.testng.Assert.assertEquals; -import jakarta.interceptor.Interceptors; import javax.naming.InitialContext; + +import jakarta.interceptor.Interceptors; import jakarta.transaction.TransactionSynchronizationRegistry; + import org.testng.Assert; public class Baz { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/BazInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/BazInterceptor.java index 78691bc666..40593f7644 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/BazInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/BazInterceptor.java @@ -15,15 +15,16 @@ import static org.testng.Assert.assertEquals; +import javax.naming.InitialContext; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.InvocationContext; -import javax.naming.InitialContext; import jakarta.transaction.TransactionSynchronizationRegistry; public class BazInterceptor { static boolean called = false; - + @AroundInvoke public Object intercept(InvocationContext ic) throws Exception { Object obj = ic.proceed(); diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/FooInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/FooInterceptor.java index 1a5f61d47d..7f8578925c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/FooInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundInvoke/ee/FooInterceptor.java @@ -15,15 +15,16 @@ import static org.testng.Assert.assertEquals; +import javax.naming.InitialContext; + import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.InvocationContext; -import javax.naming.InitialContext; import jakarta.transaction.TransactionSynchronizationRegistry; public class FooInterceptor { static boolean called = false; - + @AroundInvoke public Object intercept(InvocationContext ic) throws Exception { Object obj = ic.proceed(); diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/AroundTimeoutInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/AroundTimeoutInterceptorTest.java index 8bc42c4092..7a247a1b43 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/AroundTimeoutInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/AroundTimeoutInterceptorTest.java @@ -62,7 +62,7 @@ public boolean isSatisfied() { "Around-timeout method invocation did NOT occur within the same transaction context as the timeout method on which it is interposing"); } - @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = {JAVAEE_FULL, SECURITY}) + @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER, groups = { JAVAEE_FULL, SECURITY }) @SpecAssertion(section = TIMEOUT_METHOD_INT_METHODS, id = "d") @SpecAssertion(section = TIMEOUT_METHOD_INT_METHODS, id = "eb") public void testSecurityContext(Student student) throws Exception { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/Bell.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/Bell.java index 08e2220cf2..ef1435cf80 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/Bell.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/Bell.java @@ -26,7 +26,7 @@ public void callFromInterceptor() { } @PreDestroy - public void preDestroy(){ + public void preDestroy() { TestData.preDestroyed.set(true); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/TimeoutInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/TimeoutInterceptor.java index f379733f34..eba79153f8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/TimeoutInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/TimeoutInterceptor.java @@ -13,10 +13,11 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.aroundTimeout; +import javax.naming.InitialContext; + import jakarta.ejb.Timer; import jakarta.interceptor.AroundTimeout; import jakarta.interceptor.InvocationContext; -import javax.naming.InitialContext; import jakarta.transaction.TransactionSynchronizationRegistry; public class TimeoutInterceptor { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/bindings/Binding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/bindings/Binding.java index 2e099a4453..d6b556f5c7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/bindings/Binding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/aroundTimeout/bindings/Binding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor1.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor1.java index 82832f89ff..90a2900ae2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor1.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor2.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor2.java index 470e3cd028..cc354147d1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor2.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeInterceptor2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeThreadInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeThreadInterceptor.java index fdf82df75b..f460f7fb8b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeThreadInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundInvokeThreadInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundTimeoutThreadInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundTimeoutThreadInterceptor.java index ad0110c196..1c2af7b250 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundTimeoutThreadInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/AroundTimeoutThreadInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/Foo.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/Foo.java index c585826c24..c7ee4b06ba 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/Foo.java @@ -28,7 +28,7 @@ public int count(int input) { called = true; return 0; } - + @AroundInvoke private Object intercept(InvocationContext ctx) throws Exception { called = true; diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Bar.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Bar.java index addc9372fc..7dc4e48ea9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Bar.java @@ -13,13 +13,13 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import jakarta.enterprise.context.Dependent; -import javax.naming.InitialContext; -import javax.naming.NamingException; - @MyBinding @Dependent public class Bar { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Foo.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Foo.java index 44d511a2cd..027cd0feef 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/Foo.java @@ -6,20 +6,20 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import jakarta.enterprise.context.Dependent; -import javax.naming.InitialContext; -import javax.naming.NamingException; - @MyBinding @Dependent public class Foo { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyBinding.java index e92f3a8b62..b2d6fc084b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyInterceptor.java index 6f25ed1180..0aab5316c2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/MyInterceptor.java @@ -6,21 +6,22 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import jakarta.annotation.PostConstruct; import jakarta.annotation.Priority; import jakarta.annotation.Resource; import jakarta.inject.Inject; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import javax.naming.InitialContext; -import javax.naming.NamingException; @MyBinding @Priority(1000) diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Bar.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Bar.java index db433f41f1..dc3e8d8b73 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Bar.java @@ -13,11 +13,12 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi.ejb; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import jakarta.ejb.Stateless; -import javax.naming.InitialContext; -import javax.naming.NamingException; @MyBinding @Stateless diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Foo.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Foo.java index 150697281c..02623479cb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/Foo.java @@ -13,11 +13,12 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi.ejb; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import jakarta.ejb.Stateless; -import javax.naming.InitialContext; -import javax.naming.NamingException; @MyBinding @Stateless diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyBinding.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyBinding.java index ddfc2c48f1..1db5be305f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyInterceptor.java index 9cda92db40..0bc1f7160f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/interceptorLifeCycle/environment/jndi/ejb/MyInterceptor.java @@ -6,21 +6,22 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.contract.interceptorLifeCycle.environment.jndi.ejb; +import javax.naming.InitialContext; +import javax.naming.NamingException; + import jakarta.annotation.PostConstruct; import jakarta.annotation.Priority; import jakarta.annotation.Resource; import jakarta.inject.Inject; import jakarta.interceptor.Interceptor; import jakarta.interceptor.InvocationContext; -import javax.naming.InitialContext; -import javax.naming.NamingException; @MyBinding @Priority(1000) diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Airborne.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Airborne.java index 52abe7b2cf..6456b0bb9e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Airborne.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Airborne.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/AirborneInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/AirborneInterceptor.java index 72f7d4c1ec..c31bae46b0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/AirborneInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/AirborneInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/DestructionInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/DestructionInterceptor.java index e0f6b1ea79..4417406a59 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/DestructionInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/DestructionInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Destructive.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Destructive.java index 88b1b0cb8a..aff8560bcc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Destructive.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Destructive.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Foo.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Foo.java index 70953f033f..28aa8d7c23 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Missile.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Missile.java index eea706076a..177b2289b4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Missile.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SessionBeanLifecycleInterceptorDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SessionBeanLifecycleInterceptorDefinitionTest.java index b671aabf3a..dd47d85142 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SessionBeanLifecycleInterceptorDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SessionBeanLifecycleInterceptorDefinitionTest.java @@ -20,6 +20,7 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SuperDestructionInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SuperDestructionInterceptor.java index 926adee149..8e1c96f5d5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SuperDestructionInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/SuperDestructionInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Weapon.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Weapon.java index f3e71c3df6..5d1668313d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Weapon.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/bindings/ejb/Weapon.java @@ -16,13 +16,13 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; - import jakarta.enterprise.context.Dependent; + import org.jboss.cdi.tck.util.ActionSequence; /** * @author Martin Kouba - * + * */ @Dependent public class Weapon { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Animal.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Animal.java index 17ab151cfb..1e98d6b8b5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Animal.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Animal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/AnimalInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/AnimalInterceptor.java index f61b5f2ffb..ea113b1af9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/AnimalInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/AnimalInterceptor.java @@ -6,13 +6,15 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback.ejb; +import static org.testng.Assert.assertNotNull; + import java.util.HashSet; import java.util.Set; @@ -21,8 +23,6 @@ import jakarta.interceptor.AroundInvoke; import jakarta.interceptor.InvocationContext; -import static org.testng.Assert.assertNotNull; - public class AnimalInterceptor { private static Set postConstructInterceptorCalledFor = new HashSet(); private static Set preDestroyInterceptorCalledFor = new HashSet(); diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Bar.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Bar.java index 0a35f38a19..267f50f600 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/CatInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/CatInterceptor.java index 5fd1681e7e..db27519d29 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/CatInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/CatInterceptor.java @@ -15,10 +15,11 @@ import static org.testng.Assert.assertEquals; +import javax.naming.InitialContext; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.interceptor.InvocationContext; -import javax.naming.InitialContext; import jakarta.transaction.TransactionSynchronizationRegistry; public class CatInterceptor { diff --git a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/LifecycleCallbackInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/LifecycleCallbackInterceptorTest.java index 6c85b5b304..63b4ce7c26 100644 --- a/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/LifecycleCallbackInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/interceptors/tests/contract/lifecycleCallback/ejb/LifecycleCallbackInterceptorTest.java @@ -13,8 +13,13 @@ */ package org.jboss.cdi.tck.interceptors.tests.contract.lifecycleCallback.ejb; +import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; +import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_METHODS_FOR_LIFECYCLE_EVENT_CALLBACKS; +import static org.testng.Assert.assertTrue; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -23,10 +28,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; -import static org.jboss.cdi.tck.interceptors.InterceptorsSections.INT_METHODS_FOR_LIFECYCLE_EVENT_CALLBACKS; -import static org.testng.Assert.assertTrue; - @SpecVersion(spec = "interceptors", version = "1.2") public class LifecycleCallbackInterceptorTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/selenium/ChromeDevtoolsDriver.java b/web/src/main/java/org/jboss/cdi/tck/selenium/ChromeDevtoolsDriver.java index 641183d5d4..f72b1173d9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/selenium/ChromeDevtoolsDriver.java +++ b/web/src/main/java/org/jboss/cdi/tck/selenium/ChromeDevtoolsDriver.java @@ -16,7 +16,19 @@ // Original code stemming 100% from me, hence relicense from EPL package org.jboss.cdi.tck.selenium; -import io.github.bonigarcia.wdm.WebDriverManager; +import java.net.URI; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.BiFunction; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Stream; + import org.apache.commons.io.output.NullOutputStream; import org.openqa.selenium.*; import org.openqa.selenium.chrome.ChromeDriver; @@ -41,18 +53,7 @@ import org.openqa.selenium.virtualauthenticator.VirtualAuthenticator; import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; -import java.net.URI; -import java.net.URLDecoder; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.BiFunction; -import java.util.function.Predicate; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Stream; +import io.github.bonigarcia.wdm.WebDriverManager; /** * Extended driver which we need for getting @@ -136,7 +137,8 @@ private void initNetworkListeners(DevTools devTools) { RequestId requestId = entry.getRequestId(); //only in case of a match we add response to request //so we only cover our ajax cycle and the original get - Optional found = cycleData.stream().filter(item -> item.requestId.toJson().equals(requestId.toJson())).findFirst(); + Optional found = cycleData.stream() + .filter(item -> item.requestId.toJson().equals(requestId.toJson())).findFirst(); found.ifPresent(httpCycleData -> httpCycleData.responseReceived = entry); }); } @@ -233,7 +235,6 @@ public void deleteNetworkConditions() { delegate.deleteNetworkConditions(); } - public SessionId getSessionId() { return delegate.getSessionId(); } @@ -279,7 +280,8 @@ public List findElements(By locator) { return delegate.findElements(locator); } - public List findElements(SearchContext context, BiFunction findCommand, By locator) { + public List findElements(SearchContext context, BiFunction findCommand, + By locator) { return delegate.findElements(context, findCommand, locator); } @@ -409,7 +411,6 @@ public DevTools getDevTools() { return delegate.getDevTools(); } - @Override public int getResponseStatus() { try { @@ -463,7 +464,8 @@ private void sortResponses() { if (o2.responseReceived == null) { return 1; } - return Long.compare(o1.responseReceived.getTimestamp().toJson().longValue(), o2.responseReceived.getTimestamp().toJson().longValue()); + return Long.compare(o1.responseReceived.getTimestamp().toJson().longValue(), + o2.responseReceived.getTimestamp().toJson().longValue()); }); } @@ -497,7 +499,6 @@ public JavascriptExecutor getJSExecutor() { */ static AtomicBoolean firstLog = new AtomicBoolean(Boolean.TRUE); - public static ExtendedWebDriver stdInit() { Locale.setDefault(new Locale("en", "US")); WebDriverManager.chromedriver().setup(); @@ -508,8 +509,8 @@ public static ExtendedWebDriver stdInit() { // we can turn on a visual browser by // adding chromedriver.headless = false to our properties // default is headless = true - if(System.getProperty("chromedriver.headless") == null || - "true".equals(System.getProperty("chromedriver.headless"))) { + if (System.getProperty("chromedriver.headless") == null || + "true".equals(System.getProperty("chromedriver.headless"))) { options.addArguments("--headless"); } options.addArguments("--no-sandbox"); @@ -540,10 +541,10 @@ private static void initCDPVersionMessageFilter() { logger.setFilter(record -> { //report the match warning only once, this suffices boolean isMatchWarning = record.getMessage().contains("Unable to find an exact match for CDP version"); - if(isMatchWarning && !firstLog.get()) { + if (isMatchWarning && !firstLog.get()) { return false; } - if(isMatchWarning) { + if (isMatchWarning) { firstLog.set(false); } return true; diff --git a/web/src/main/java/org/jboss/cdi/tck/selenium/DriverPool.java b/web/src/main/java/org/jboss/cdi/tck/selenium/DriverPool.java index 571299caa7..9e56e9c047 100644 --- a/web/src/main/java/org/jboss/cdi/tck/selenium/DriverPool.java +++ b/web/src/main/java/org/jboss/cdi/tck/selenium/DriverPool.java @@ -28,16 +28,16 @@ public class DriverPool { ConcurrentLinkedQueue allDrivers = new ConcurrentLinkedQueue<>(); ConcurrentLinkedQueue availableDrivers = new ConcurrentLinkedQueue<>(); - /** * creates or activates a new driver instance + * * @return a new or recycled driver instance */ public synchronized ExtendedWebDriver getOrNewInstance() { //synchronized to avoid get race conditions.... there is a non synchonzed part between the check and remove //to make this easy we simply synchronize the get to fix it ExtendedWebDriver webDriver = (availableDrivers.size() > 0) ? availableDrivers.remove() : null; - if(webDriver == null) { + if (webDriver == null) { webDriver = ChromeDevtoolsDriver.stdInit(); allDrivers.add(webDriver); } @@ -48,6 +48,7 @@ public synchronized ExtendedWebDriver getOrNewInstance() { /** * resets a driver and keeps it in the pool for recycling + * * @param driver */ public void returnInstance(ExtendedWebDriver driver) { @@ -57,6 +58,7 @@ public void returnInstance(ExtendedWebDriver driver) { /** * closes a driver but keeps it in the pool + * * @param driver */ public void returnAndCloseInstance(ExtendedWebDriver driver) { @@ -66,6 +68,7 @@ public void returnAndCloseInstance(ExtendedWebDriver driver) { /** * quits a driver and removes it from the pool + * * @param driver */ public void quitInstance(ExtendedWebDriver driver) { diff --git a/web/src/main/java/org/jboss/cdi/tck/selenium/ExtendedWebDriver.java b/web/src/main/java/org/jboss/cdi/tck/selenium/ExtendedWebDriver.java index 2ed97769a8..f36f8cc512 100644 --- a/web/src/main/java/org/jboss/cdi/tck/selenium/ExtendedWebDriver.java +++ b/web/src/main/java/org/jboss/cdi/tck/selenium/ExtendedWebDriver.java @@ -32,17 +32,18 @@ public interface ExtendedWebDriver extends WebDriver { /** * gets the response status of the last response (of the last triggered request against get) + * * @return */ int getResponseStatus(); /** * gets the last response as body + * * @return */ String getResponseBody(); - /** * @return the request post data as string */ @@ -55,12 +56,14 @@ public interface ExtendedWebDriver extends WebDriver { /** * gets the internal webdriver delegate + * * @return */ WebDriver getDelegate(); /** * returns a reference to the Selenium JS Executor of this webdriver + * * @return */ JavascriptExecutor getJSExecutor(); @@ -73,6 +76,7 @@ public interface ExtendedWebDriver extends WebDriver { /** * returns the innerText of the page in a blank reduced state (more than one blank is reduced to one * invisible blanks like nbsp are replaced by normal blanks) + * * @return */ String getPageTextReduced(); diff --git a/web/src/main/java/org/jboss/cdi/tck/selenium/WebPage.java b/web/src/main/java/org/jboss/cdi/tck/selenium/WebPage.java index 281486669c..ef15c8160c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/selenium/WebPage.java +++ b/web/src/main/java/org/jboss/cdi/tck/selenium/WebPage.java @@ -16,16 +16,16 @@ // Original code stemming 100% from me, hence relicense from EPL package org.jboss.cdi.tck.selenium; -import org.openqa.selenium.*; -import org.openqa.selenium.support.ui.ExpectedCondition; -import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.WebDriverWait; - import java.time.Duration; import java.util.List; import java.util.Set; import java.util.function.Function; +import org.openqa.selenium.*; +import org.openqa.selenium.support.ui.ExpectedCondition; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; + /** * Mimics the html unit webpage */ @@ -40,12 +40,10 @@ public WebPage(ExtendedWebDriver webDriver) { this.webDriver = webDriver; } - public ExtendedWebDriver getWebDriver() { return webDriver; } - public void setWebDriver(ExtendedWebDriver webDriver) { this.webDriver = webDriver; } @@ -73,13 +71,14 @@ public void waitForBackgroundJavascript(Duration timeout) { * * @param timeout the timeout until the wait is terminated max * @param delayAfterExcecution this introduces a second delay after the determined - * end of exeuction point. + * end of exeuction point. */ public void waitForBackgroundJavascript(Duration timeout, Duration delayAfterExcecution) { synchronized (webDriver) { WebDriverWait wait = new WebDriverWait(webDriver, timeout); double rand = Math.random(); - @SuppressWarnings("UnnecessaryLabelJS") final String identifier = "__insert__:" + rand; + @SuppressWarnings("UnnecessaryLabelJS") + final String identifier = "__insert__:" + rand; webDriver.manage().timeouts().scriptTimeout(timeout); // We use a trick here, javascript is cooperative multitasking // we defer into a time when the script is executed @@ -87,11 +86,11 @@ public void waitForBackgroundJavascript(Duration timeout, Duration delayAfterExc // At the time the element gets added, we are either at an end of execution // phase or in an execution pause (timeouts maybe pending etc...) try { - webDriver.getJSExecutor().executeAsyncScript("let [resolve] = arguments; setTimeout(function() { var insert__ = document.createElement('div');" + - "insert__.id = '" + identifier + "';" + - "insert__.innerHTML = 'done';" + - "document.body.append(insert__); resolve()}, 50);"); - + webDriver.getJSExecutor().executeAsyncScript( + "let [resolve] = arguments; setTimeout(function() { var insert__ = document.createElement('div');" + + "insert__.id = '" + identifier + "';" + + "insert__.innerHTML = 'done';" + + "document.body.append(insert__); resolve()}, 50);"); wait.until(ExpectedConditions.numberOfElementsToBeMoreThan(By.id(identifier), 0)); // problem is here, if we are in a code pause phase (aka timeout is pending but not executed) @@ -101,7 +100,8 @@ public void waitForBackgroundJavascript(Duration timeout, Duration delayAfterExc wait(delayAfterExcecution); } } finally { - webDriver.getJSExecutor().executeScript("document.body.removeChild(document.getElementById('" + identifier + "'));"); + webDriver.getJSExecutor() + .executeScript("document.body.removeChild(document.getElementById('" + identifier + "'));"); } } } @@ -109,6 +109,7 @@ public void waitForBackgroundJavascript(Duration timeout, Duration delayAfterExc /** * waits for a certain condition is met, until a timeout is hit. * In case of exceeding the condition, a runtime exception is thrown! + * * @param isTrue the condition lambda to check * @param timeout timeout duration */ @@ -121,6 +122,7 @@ public void waitForCondition(Function isTrue, Duration /** * The same as before, but with the long default timeout of LONG_TIMEOUT (16000ms) + * * @param isTrue condition lambda */ public void waitForCondition(Function isTrue) { @@ -130,13 +132,13 @@ public void waitForCondition(Function isTrue) { } } - /** * Wait for a certain period of time + * * @param timeout the timeout to wait (note due to the asynchronous nature - * of the web drivers, any code running on the browser itself - * will proceed (aka javascript) - * only the client operations are stalled. + * of the web drivers, any code running on the browser itself + * will proceed (aka javascript) + * only the client operations are stalled. */ public void wait(Duration timeout) { synchronized (webDriver) { @@ -158,6 +160,7 @@ public void waitForCurrentRequestEnd() { /** * wait for the current request to be ended, with a timeout of "timeout" + * * @param timeout the timeout for the waiting, if it is exceeded a timeout exception is thrown */ public void waitForCurrentRequestEnd(Duration timeout) { @@ -176,8 +179,9 @@ public void waitReqJs() { /** * same as before but with a dedicated timeout + * * @param timeout the timeout duration after that the wait is cancelled - * and an exception is thrown + * and an exception is thrown */ public void waitReqJs(Duration timeout) { // We stall the connection between browser and client for 200ms to make sure everything @@ -217,6 +221,7 @@ public void waitForPageToLoad() { /** * conditional waiter and checker which checks whether the page text is present * we add our own waiter internally, because pageSource always delivers + * * @param text to check * @return true in case of found false in case of found after our standard timeout is reached */ @@ -236,7 +241,8 @@ public boolean isInPageText(String text) { public boolean isInPageTextReduced(String text) { try { String values = getInputValues(); - waitForCondition(webDriver1 -> (webDriver.getPageTextReduced() + values.replaceAll("\\s+", " ")).contains(text), STD_TIMEOUT); + waitForCondition(webDriver1 -> (webDriver.getPageTextReduced() + values.replaceAll("\\s+", " ")).contains(text), + STD_TIMEOUT); return true; } catch (TimeoutException ex) { //timeout is wanted in this case and should result in a false @@ -269,9 +275,11 @@ public boolean matchesPageTextReduced(String regexp) { return false; } } + /** * conditional waiter and checker which checks whether a text is not in the page * we add our own waiter internally, because pageSource always delivers + * * @param text to check * @return true in case of found false in case of found after our standard timeout is reached */ @@ -287,9 +295,10 @@ public boolean isNotInPageText(String text) { } /** - * conditional waiter and checker which checks whether a text is in the page + * conditional waiter and checker which checks whether a text is in the page * we add our own waiter internally, because pageSource always delivers * this version of isInPage checks explicitly the full markup not only the text + * * @param text to check * @return true in case of found false in case of found after our standard timeout is reached */ @@ -303,6 +312,7 @@ public boolean isInPage(String text) { return false; } } + /** * conditional waiter and checker which checks whether a text is not in the page * we add our own waiter internally, because pageSource always delivers @@ -310,6 +320,7 @@ public boolean isInPage(String text) { * a timeout automatically throws internally an error which is mapped to false * We therefore cannot simply wait for the condition either being met or timeout * with one method + * * @param text to check * @return true in case of found false in case of found after our standard timeout is reached */ @@ -331,6 +342,7 @@ public boolean isNotInPage(String text) { * a timeout automatically throws internally an error which is mapped to false * We therefore cannot simply wait for the condition either being met or timeout * with one method + * * @param text to check * @return true in case of found false in case of found after our standard timeout is reached */ @@ -340,7 +352,7 @@ public boolean isInPage(String text, boolean allowExceptions) { waitForCondition(webDriver1 -> (webDriver.getPageSource() + values).contains(text), STD_TIMEOUT); return true; } catch (TimeoutException exception) { - if(allowExceptions) { + if (allowExceptions) { throw exception; } exception.printStackTrace(); @@ -351,6 +363,7 @@ public boolean isInPage(String text, boolean allowExceptions) { /** * is condition reached or not reached after until a STD_TIMEOUT is reached * if the timeout is exceeded the condition is not met + * * @param isTrue the isTrue condition lambda * @return true if it is met until STD_TIMEOUT, otherwise false */ @@ -367,6 +380,7 @@ public boolean isCondition(Function isTrue) { public WebElement findElement(By by) { return webDriver.findElement(by); } + public List findElements(By by) { return webDriver.findElements(by); } @@ -441,6 +455,7 @@ public WebDriver.Options manage() { /** * Convenience method to get all anchor elmements + * * @return a list of a hrefs as WebElements */ public List getAnchors() { diff --git a/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/DummySessionBean.java b/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/DummySessionBean.java index 942c9f3cfb..4e9a343216 100644 --- a/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/DummySessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/DummySessionBean.java @@ -17,10 +17,10 @@ /** * Dummy session bean used to make every EJB module true EJB module (JBoss AS7 sub-deployment). - * + * * See also Test EAR deploys on AS7, but test config can't be * found or War classes cannot see EJB classes threads. - * + * * @author Martin Kouba */ @Stateless(name = "org.jboss.cdi.tck.shrinkwrap.DummySessionBean") diff --git a/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/WebArchiveBuilder.java b/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/WebArchiveBuilder.java index ea36e23538..2eec2dadc1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/WebArchiveBuilder.java +++ b/web/src/main/java/org/jboss/cdi/tck/shrinkwrap/ee/WebArchiveBuilder.java @@ -93,7 +93,8 @@ protected WebArchive buildInternal() { // Deployment descriptors if (includeBeansXml) { - webArchive.addAsWebInfResource(getBeansDescriptorAsset(), buildBeansDescriptorTargetPath(getBeansDescriptorTarget())); + webArchive.addAsWebInfResource(getBeansDescriptorAsset(), + buildBeansDescriptorTargetPath(getBeansDescriptorTarget())); } if (webXmlDescriptor != null) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/DisabledEjbInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/DisabledEjbInterface.java index d68e790275..cdbc98b639 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/DisabledEjbInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/DisabledEjbInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EjbInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EjbInterface.java index cf30442096..abdbc96331 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EjbInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EjbInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EnabledEjb.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EnabledEjb.java index c2cdabc10a..6cfa1d7bdb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EnabledEjb.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/EnabledEjb.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/NotEnabledEjb.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/NotEnabledEjb.java index c9d659185b..30c44efd6e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/NotEnabledEjb.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/NotEnabledEjb.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 292c926be1..d93606c2cd 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 06d910fabf..655841507f 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/EnabledResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/EnabledResourceProducer.java index c1c237f0cb..f80bdf1141 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/EnabledResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/EnabledResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/NotEnabledResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/NotEnabledResourceProducer.java index 68b3cc58b1..ad880babb1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/NotEnabledResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/enterprise/resource/NotEnabledResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 faab62e0af..5728eefd1e 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 @@ -19,10 +19,13 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import java.util.Set; + import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; import jakarta.persistence.EntityManager; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -32,8 +35,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - /** * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative01Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative01Test.java index 7f43c9fd03..a9510b7081 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative01Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative01Test.java @@ -32,28 +32,30 @@ import org.testng.annotations.Test; /** - * The simplest possible scenario - test session bean alternative selected for the entire application, no priority ordering during resolution. - * + * The simplest possible scenario - test session bean alternative selected for the entire application, no priority ordering + * during resolution. + * * WAR deployment with 2 libraries: *
      *
    • WEB-INF/classes - alpha - contains {@link EnterpriseService} alternative with priority 1000
      • *
    • lib 1 - bravo - contains {@link PojoService}
      • *
    - * + * * Expected results: *
      *
    • {@link EnterpriseService} is available for injection in all bean archives
      • *
    - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class EnterpriseSelectedAlternative01Test extends AbstractTest { @Deployment public static WebArchive createTestArchive() { - return createBuilderBase().withTestClass(EnterpriseSelectedAlternative01Test.class).withClasses(Service.class, EnterpriseService.class, Alpha.class) + return createBuilderBase().withTestClass(EnterpriseSelectedAlternative01Test.class) + .withClasses(Service.class, EnterpriseService.class, Alpha.class) .withBeanLibrary(PojoService.class, Bravo.class).build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative02Test.java index 31ca460775..a19c338ccf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative02Test.java @@ -32,20 +32,20 @@ import org.testng.annotations.Test; /** - * + * * EAR deployment with 1 library and 1 war: *
      *
    • ear lib - contains {@link Service} and a simple service implementation {@link PojoService}
      • *
    • war - contains {@link EnterpriseService} alternative with priority 1000, should be visible for the war only
      • *
    - * + * * Expected results: *
      *
    • {@link EnterpriseService} is available for injection in beans in war only
      • *
    - * + * * @author Matej Briskar - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class EnterpriseSelectedAlternative02Test extends AbstractTest { @@ -54,14 +54,15 @@ public class EnterpriseSelectedAlternative02Test extends AbstractTest { public static EnterpriseArchive createTestArchive() { EnterpriseArchive enterpriseArchive = SelectedAlternativeTestUtil.createEnterpriseBuilderBase() - // A - default EJB jar + // A - default EJB jar .withTestClassDefinition(EnterpriseSelectedAlternative02Test.class) // C - lib visible to all .withBeanLibrary(Bravo.class, Service.class, PojoService.class).noDefaultWebModule().build(); // E - not visible for AC WebArchive bazWebArchive = SelectedAlternativeTestUtil.createBuilderBase().notTestArchive() - .withClasses(Charlie.class, EnterpriseService.class, EnterpriseSelectedAlternative02Test.class).withBeanLibrary(Alpha.class).build(); + .withClasses(Charlie.class, EnterpriseService.class, EnterpriseSelectedAlternative02Test.class) + .withBeanLibrary(Alpha.class).build(); enterpriseArchive.addAsModule(bazWebArchive); return enterpriseArchive; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative03Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative03Test.java index 82823786a2..92f56fe48b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative03Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/EnterpriseSelectedAlternative03Test.java @@ -40,25 +40,27 @@ import org.testng.annotations.Test; /** - * + * * EAR deployment with 2 libraries and 1 war: *
      *
    • ear 1.lib - contains {@link Foo} TestBean alternative with priority 1000
      • - * - *
    • war - contains {@link Bar} TestBean alternative with priority 2000, {@link BarProducer} Bar alternative producer method and Bar alternative producer + * + *
    • war - contains {@link Bar} TestBean alternative with priority 2000, {@link BarProducer} Bar alternative producer method + * and Bar alternative producer * field with priority 1100 with 2 different annotations .
      • *
    - * + * * Expected results: *
      *
    • {@link Foo} is available for injection in all beans
      • *
    • {@link Bar} is available for injection in beans in war only
      • *
    • when injecting {@link TestBean}, {@link Bar} is preferred if visible
      • - *
    • {@link BarProducer} alternative producer method and alternative producer field are both selected and visible in war only.
      • + *
    • {@link BarProducer} alternative producer method and alternative producer field are both selected and visible in war + * only.
      • *
    - * + * * @author Matej Briskar - * + * */ @SpecVersion(spec = "cdi", version = "2.0") @@ -68,13 +70,14 @@ public class EnterpriseSelectedAlternative03Test extends AbstractTest { public static EnterpriseArchive createTestArchive() { EnterpriseArchive enterpriseArchive = SelectedAlternativeTestUtil.createEnterpriseBuilderBase() - // A - default EJB jar + // A - default EJB jar .withTestClassDefinition(EnterpriseSelectedAlternative03Test.class) // C - lib visible to all .withBeanLibrary(Foo.class).withBeanLibrary(Bravo.class).noDefaultWebModule().build(); // E - not visible for AC - WebArchive bazWebArchive = new WebArchiveBuilder().notTestArchive().withClasses(Bar.class, EnterpriseSelectedAlternative03Test.class) + WebArchive bazWebArchive = new WebArchiveBuilder().notTestArchive() + .withClasses(Bar.class, EnterpriseSelectedAlternative03Test.class) .withBeanLibrary(Alpha.class, Charlie.class, BarProducer.class).build(); enterpriseArchive.addAsModule(bazWebArchive); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/SelectedAlternativeTestUtil.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/SelectedAlternativeTestUtil.java index fc8b086ca8..56082916f2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/SelectedAlternativeTestUtil.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/enterprise/SelectedAlternativeTestUtil.java @@ -13,8 +13,8 @@ */ package org.jboss.cdi.tck.tests.alternative.selection.enterprise; -import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; +import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.tests.alternative.selection.AssertBean; import org.jboss.cdi.tck.tests.alternative.selection.Tame; import org.jboss.cdi.tck.tests.alternative.selection.TestBean; @@ -23,12 +23,16 @@ public class SelectedAlternativeTestUtil { public static WebArchiveBuilder createBuilderBase() { - return new WebArchiveBuilder().withLibrary(org.jboss.cdi.tck.tests.alternative.selection.SelectedAlternativeTestUtil.class, TestBean.class, Wild.class, Tame.class, - AssertBean.class); + return new WebArchiveBuilder().withLibrary( + org.jboss.cdi.tck.tests.alternative.selection.SelectedAlternativeTestUtil.class, TestBean.class, Wild.class, + Tame.class, + AssertBean.class); } + public static EnterpriseArchiveBuilder createEnterpriseBuilderBase() { - return new EnterpriseArchiveBuilder().withLibrary(org.jboss.cdi.tck.tests.alternative.selection.SelectedAlternativeTestUtil.class, TestBean.class, Wild.class, - Tame.class, AssertBean.class); + return new EnterpriseArchiveBuilder().withLibrary( + org.jboss.cdi.tck.tests.alternative.selection.SelectedAlternativeTestUtil.class, TestBean.class, Wild.class, + Tame.class, AssertBean.class); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ProductionReady.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ProductionReady.java index 939b4d4dcb..bf27be67b4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ProductionReady.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ProductionReady.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative01Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative01Test.java index 95ece97eb2..8ed40335ee 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative01Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative01Test.java @@ -62,7 +62,8 @@ public static WebArchive createTestArchive() { .withBeanLibrary(Charlie.class) .withWebXml( Descriptors.create(WebAppDescriptor.class).createEnvEntry().envEntryName("test1") - .envEntryType("java.lang.String").envEntryValue("hello").up()).build(); + .envEntryType("java.lang.String").envEntryValue("hello").up()) + .build(); } @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative04Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative04Test.java index ae857628af..8146435bf3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative04Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternative04Test.java @@ -65,7 +65,8 @@ public static WebArchive createTestArchive() { .envEntryType("java.lang.String").envEntryValue("hello1").up().createEnvEntry() .envEntryName("test2").envEntryType("java.lang.String").envEntryValue("hello2").up() .createEnvEntry().envEntryName("test3").envEntryType("java.lang.String") - .envEntryValue("hello3").up()).build(); + .envEntryValue("hello3").up()) + .build(); } @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternativeExplicitPriorityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternativeExplicitPriorityTest.java index e5d265d1bb..77a3da68e8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternativeExplicitPriorityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceAlternativeExplicitPriorityTest.java @@ -18,6 +18,7 @@ import static org.jboss.cdi.tck.tests.alternative.selection.SelectedAlternativeTestUtil.createBuilderBase; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.tests.alternative.selection.Alpha; @@ -47,7 +48,8 @@ public static WebArchive createTestArchive() { .withBeanLibrary(Charlie.class) .withWebXml( Descriptors.create(WebAppDescriptor.class).createEnvEntry().envEntryName("test1") - .envEntryType("java.lang.String").envEntryValue("hello").up()).build(); + .envEntryType("java.lang.String").envEntryValue("hello").up()) + .build(); } @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceProducer.java index cec10d71dc..7d9cf4aa9f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/alternative/selection/resource/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/ActivateRequestContextinEETest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/ActivateRequestContextinEETest.java index 57a39d97a9..1b16cd3c4c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/ActivateRequestContextinEETest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/ActivateRequestContextinEETest.java @@ -18,8 +18,6 @@ import java.net.URL; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; @@ -30,6 +28,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + /** * @author Tomas Remes */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/TestServlet.java index 6c98be5fc0..3ba228e6b9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/activation/TestServlet.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.context.activation; import java.io.IOException; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.context.control.RequestContextController; import jakarta.enterprise.inject.spi.BeanManager; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ApplicationResource.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ApplicationResource.java index f350645266..e796262064 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ApplicationResource.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ApplicationResource.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,9 +21,9 @@ /** * RESTful web service which returns a value from an application scoped bean. - * + * * @author David Allen - * + * */ @Path("/application-id") public class ApplicationResource { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/Result.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/Result.java index d987ad19a5..3cc86d3354 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/Result.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/Result.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/SimpleApplicationBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/SimpleApplicationBean.java index 664a7edfaa..b6403f093f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/SimpleApplicationBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/SimpleApplicationBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestFilter.java index 969a82afec..1d61232715 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestFilter.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestHttpSessionListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestHttpSessionListener.java index ee1666017f..ef5a552405 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestHttpSessionListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestHttpSessionListener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServlet.java index d275aaa5c3..7e6fbb4e7f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,9 +27,9 @@ /** * Servlet used to test application context during service method and also for reporting test results of testing the context * during a method invocation on ServletContextListener, HttpSessionListener and ServlerRequestListener. - * + * * @author David Allen - * + * */ public class TestServlet extends HttpServlet { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletContextListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletContextListener.java index c778539b74..1289e92eb2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletContextListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletContextListener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletRequestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletRequestListener.java index c5c009d90b..db42e781d3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletRequestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/TestServletRequestListener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/ApplicationContextAsyncListenerTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/ApplicationContextAsyncListenerTest.java index ecb3d24b7e..67a4ad67b1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/ApplicationContextAsyncListenerTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/ApplicationContextAsyncListenerTest.java @@ -21,8 +21,6 @@ import java.net.URL; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; @@ -32,6 +30,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + /** * * @author Martin Kouba @@ -49,7 +50,7 @@ public static WebArchive createTestArchive() { .build(); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = APPLICATION_CONTEXT_EE, id = "ae") public void testApplicationContextActiveOnComplete() throws Exception { WebClient webClient = new WebClient(); @@ -62,7 +63,7 @@ public void testApplicationContextActiveOnComplete() throws Exception { assertTrue(results.getContent().contains("onComplete: true")); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = APPLICATION_CONTEXT_EE, id = "ae") public void testApplicationContextActiveOnTimeout() throws Exception { WebClient webClient = new WebClient(); @@ -71,7 +72,7 @@ public void testApplicationContextActiveOnTimeout() throws Exception { assertTrue(results.getContent().contains("onTimeout: true")); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = APPLICATION_CONTEXT_EE, id = "ae") public void testApplicationContextActiveOnError() throws Exception { WebClient webClient = new WebClient(); @@ -81,7 +82,7 @@ public void testApplicationContextActiveOnError() throws Exception { assertTrue(results.getContent().contains("onError: true")); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = APPLICATION_CONTEXT_EE, id = "ae") public void testApplicationContextActiveOnStartAsync() throws Exception { WebClient webClient = new WebClient(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/SimpleAsyncListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/SimpleAsyncListener.java index 3968bc7cb3..96aa6e353a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/SimpleAsyncListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/SimpleAsyncListener.java @@ -15,11 +15,13 @@ package org.jboss.cdi.tck.tests.context.application.async; import java.io.IOException; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncListener; + import org.jboss.cdi.tck.util.SimpleLogger; /** diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/StatusServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/StatusServlet.java index e91b300df1..cbb5c65cc4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/StatusServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/async/StatusServlet.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.context.application.async; import java.io.IOException; + import jakarta.inject.Inject; import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebServlet; @@ -40,6 +41,7 @@ private void writeInfo(ServletResponse response) throws IOException { public String getInfo() { return String .format("onStartAsync: %s, onError: %s, onTimeout: %s, onComplete: %s, isSimpleApplicationBeanAvailable: %s", - statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), statusBean.isOnComplete(), statusBean.isApplicationBeanAvailable()); + statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), + statusBean.isOnComplete(), statusBean.isApplicationBeanAvailable()); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/destroy/ApplicationContextDestructionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/destroy/ApplicationContextDestructionTest.java index 6e1b1b0120..cb4886532c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/destroy/ApplicationContextDestructionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/destroy/ApplicationContextDestructionTest.java @@ -40,7 +40,7 @@ /** * Test that the application context is destroyed when the application is shut down. - * + * * @author Martin Kouba */ @RunAsClient @@ -69,7 +69,7 @@ public static WebArchive createBarTestArchive() { /** * This is not a real test method. - * + * * @see #testApplicationContextDestroyed(URL, URL) */ @Test @@ -82,7 +82,7 @@ public void deployArchives() { /** * Note that this test method depends on (must be run after) {@link #deployArchives()}. - * + * * @param fooContext * @param barContext * @throws Exception 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 b9fed8dcba..0843d0eab0 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 @@ -21,7 +21,6 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; 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 76f3ed87c8..3206fed3db 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/BarBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/BarBean.java index 907925f4d8..65c1e6a225 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/BarBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/BarBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -36,7 +36,7 @@ public class BarBean { /** * Async computation. - * + * * @return */ public Future compute() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMS.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMS.java index 2be46e08ac..35d5248739 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMS.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMS.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMSModelIII.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMSModelIII.java index 22ef63d0b1..6a2c4fc0dc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMSModelIII.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FMSModelIII.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooBean.java index a0c5545f70..40959cf16b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooRemote.java index 7932d3574d..8fe3c53b1b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/FooRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/SimpleApplicationBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/SimpleApplicationBean.java index 828d876a3e..26f8432cfe 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/SimpleApplicationBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/ejb/SimpleApplicationBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventMultiWarTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventMultiWarTest.java index 436aa111c3..87beded5c6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventMultiWarTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventMultiWarTest.java @@ -21,8 +21,6 @@ import jakarta.servlet.ServletContext; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.Testable; import org.jboss.arquillian.test.api.ArquillianResource; @@ -39,6 +37,9 @@ import org.testng.Assert; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + /** *

    * Verifies that an observer is not notified of a non-visible {@link ServletContext}. @@ -72,16 +73,19 @@ public static EnterpriseArchive createTestArchive() { .withClasses(Collector.class, ObserverNames.class, Helper.class).noDefaultWebModule().build(); StringAsset applicationXml = new StringAsset(Descriptors.create(ApplicationDescriptor.class) .version(EnterpriseArchiveBuilder.DEFAULT_APP_VERSION).applicationName("Test").createModule() - .ejb(EnterpriseArchiveBuilder.DEFAULT_EJB_MODULE_NAME).up().createModule().getOrCreateWeb().webUri(TEST1_ARCHIVE_NAME+".war") - .contextRoot("/"+TEST1_ARCHIVE_NAME).up().up().createModule().getOrCreateWeb().webUri(TEST2_ARCHIVE_NAME+".war").contextRoot("/"+TEST2_ARCHIVE_NAME).up() + .ejb(EnterpriseArchiveBuilder.DEFAULT_EJB_MODULE_NAME).up().createModule().getOrCreateWeb() + .webUri(TEST1_ARCHIVE_NAME + ".war") + .contextRoot("/" + TEST1_ARCHIVE_NAME).up().up().createModule().getOrCreateWeb() + .webUri(TEST2_ARCHIVE_NAME + ".war").contextRoot("/" + TEST2_ARCHIVE_NAME).up() .up().exportAsString()); enterpriseArchive.setApplicationXML(applicationXml); - WebArchive fooArchive = new WebArchiveBuilder().notTestArchive().withName(TEST1_ARCHIVE_NAME+".war") + WebArchive fooArchive = new WebArchiveBuilder().notTestArchive().withName(TEST1_ARCHIVE_NAME + ".war") .withClasses(Observer2.class, PingServlet.class).withDefaultEjbModuleDependency().build(); enterpriseArchive.addAsModule(Testable.archiveToTest(fooArchive)); - WebArchive barArchive = new WebArchiveBuilder().notTestArchive().withName(TEST2_ARCHIVE_NAME+".war").withClasses(Observer3.class, PingServlet.class) + WebArchive barArchive = new WebArchiveBuilder().notTestArchive().withName(TEST2_ARCHIVE_NAME + ".war") + .withClasses(Observer3.class, PingServlet.class) .withDefaultEjbModuleDependency().build(); enterpriseArchive.addAsModule(barArchive); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventTest.java index 6cd1930de7..bd48ba5734 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ApplicationScopeEventTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ObserverNames.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ObserverNames.java index 062afec60b..1fae201d1d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ObserverNames.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/ObserverNames.java @@ -13,7 +13,6 @@ */ package org.jboss.cdi.tck.tests.context.application.event; - public class ObserverNames { public static final String OBSERVER2_NAME = "org.jboss.cdi.tck.tests.context.application.event.Observer2"; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/PingServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/PingServlet.java index 5681f5226a..04e40304f3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/PingServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/event/PingServlet.java @@ -27,7 +27,7 @@ public class PingServlet extends HttpServlet { @Inject Collector collector; - + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Action.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Action.java index e925bc8184..737067e61b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Action.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Action.java @@ -22,7 +22,7 @@ /** * @author Martin Kouba - * + * */ @RequestScoped public class Action { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingleton.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingleton.java index 06411bf237..2714304431 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingleton.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingleton.java @@ -23,7 +23,7 @@ /** * @author Martin Kouba - * + * */ @Startup @Singleton diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingletonPostConstructCallbackTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingletonPostConstructCallbackTest.java index 401abc56ea..c06bdfbd82 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingletonPostConstructCallbackTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/EagerSingletonPostConstructCallbackTest.java @@ -28,9 +28,9 @@ /** * Test the request context is active during @PostConstruct callback of an eager singleton. - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class EagerSingletonPostConstructCallbackTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Service.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Service.java index 6df9d76a63..6f62860f32 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Service.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/Service.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @ApplicationScoped public class Service { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBean.java index 555bded569..51f10a99b0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBean.java @@ -22,7 +22,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class SimpleBean { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBeanPostConstructCallbackTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBeanPostConstructCallbackTest.java index bcf928f81c..c0d6dcd885 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBeanPostConstructCallbackTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/application/postconstruct/SimpleBeanPostConstructCallbackTest.java @@ -27,9 +27,9 @@ /** * Test the request context is active during @PostConstruct callback of a simple bean. - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SimpleBeanPostConstructCallbackTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/AbstractConversationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/AbstractConversationTest.java index 281c932013..f06a09e36c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/AbstractConversationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/AbstractConversationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -87,7 +87,7 @@ protected Set getElements(HtmlElement rootElement, Class elementClass) /** * Note that this method doesn't return the first element whose id equals specified id but the one whose id contains * specified id! - * + * * @param page * @param elementClass * @param id diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/BuiltInConversation.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/BuiltInConversation.java index 26a6318c6e..f92618e9a2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/BuiltInConversation.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/BuiltInConversation.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ClientConversationContextTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ClientConversationContextTest.java index eac13859f7..8ae41912d9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ClientConversationContextTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ClientConversationContextTest.java @@ -26,7 +26,6 @@ import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; @@ -51,7 +50,8 @@ public static WebArchive createTestArchive() { .withTestClassDefinition(ClientConversationContextTest.class) .withClasses(Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class, OutermostFilter.class, Cumulus.class, BuiltInConversation.class, - ConversationContextObserver.class).withWebResource("home.xhtml").withWebResource("cloud.xhtml") + ConversationContextObserver.class) + .withWebResource("home.xhtml").withWebResource("cloud.xhtml") .withWebResource("clouds.xhtml").withWebResource("cumulus.xhtml").withWebResource("builtin.xhtml") .withWebResource("error.xhtml").withWebResource("storm.xhtml").withWebResource("rain.xhtml") .withWebResource("faces-config.xml", "/WEB-INF/faces-config.xml").withWebXml("web.xml").build(); @@ -396,15 +396,14 @@ public void testSuppressedConversationPropagation() throws Exception { assertEquals(getFirstMatchingElement(page3, HtmlSpan.class, "cloudName").getTextContent(), Cloud.NAME); } - private void verifyNonexistentConversationExceptionThrown(Page page) { - if(page instanceof TextPage) { + if (page instanceof TextPage) { TextPage textPage = (TextPage) page; assertTrue(textPage.getContent().contains("NonexistentConversationException thrown properly")); assertTrue(textPage.getContent().contains("Conversation.isTransient: true")); assertTrue(textPage.getContent().contains("Cloud: " + Cloud.NAME)); } else { - fail("Unexpected response type: "+page.getClass().getName()); + fail("Unexpected response type: " + page.getClass().getName()); } } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cloud.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cloud.java index 969dfdb11c..1d32a68329 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cloud.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cloud.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,8 +29,8 @@ @ConversationScoped public class Cloud implements Serializable { /** - * - */ + * + */ private static final long serialVersionUID = 5765109971012677278L; private static final SimpleLogger logger = new SimpleLogger(Cloud.class); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/CloudController.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/CloudController.java index c705585907..d4252ae040 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/CloudController.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/CloudController.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ConversationTestPhaseListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ConversationTestPhaseListener.java index 4cf3a5d802..707421d150 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ConversationTestPhaseListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ConversationTestPhaseListener.java @@ -54,8 +54,9 @@ public void beforePhase(PhaseEvent event) { response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId() == null ? " null" : conversation.getId()); response.addHeader(AbstractConversationTest.LONG_RUNNING_HEADER_NAME, String.valueOf(!conversation.isTransient())); - response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(BeanLookupUtils.getContextualReference(beanManager, Cloud.class) - .isRained()).toString()); + response.addHeader(Cloud.RAINED_HEADER_NAME, + new Boolean(BeanLookupUtils.getContextualReference(beanManager, Cloud.class) + .isRained()).toString()); response.addHeader(ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME, new Boolean(activeBeforeApplyRequestValues).toString()); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cumulus.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cumulus.java index 85c13b966c..abc7930db9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cumulus.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Cumulus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/InvalidatingSessionDestroysConversationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/InvalidatingSessionDestroysConversationTest.java index ab974d809f..5da7850d22 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/InvalidatingSessionDestroysConversationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/InvalidatingSessionDestroysConversationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -42,7 +42,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(InvalidatingSessionDestroysConversationTest.class) .withClasses(Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, - CloudController.class, OutermostFilter.class).withWebResource("cloud.xhtml") + CloudController.class, OutermostFilter.class) + .withWebResource("cloud.xhtml") .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withWebResource("clouds.xhtml").withWebResource("faces-config.xml", "/WEB-INF/faces-config.xml") .withWebXml("web.xml").build(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/LongRunningConversationPropagatedByFacesContextTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/LongRunningConversationPropagatedByFacesContextTest.java index 69cce9f918..d8b412471d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/LongRunningConversationPropagatedByFacesContextTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/LongRunningConversationPropagatedByFacesContextTest.java @@ -30,12 +30,10 @@ import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; -import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -import org.testng.annotations.Test; - import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import org.testng.annotations.Test; import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController; import com.gargoylesoftware.htmlunit.WebClient; @@ -61,7 +59,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(LongRunningConversationPropagatedByFacesContextTest.class) .withClasses(Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, - OutermostFilter.class).withWebResource("storm.xhtml").withWebResource("storm-ajax.xhtml") + OutermostFilter.class) + .withWebResource("storm.xhtml").withWebResource("storm-ajax.xhtml") .withWebResource("thunder.xhtml").withWebResource("lightening.xhtml") .withWebResource("faces-config.xml", "/WEB-INF/faces-config.xml").withWebXml("web.xml").build(); } @@ -181,7 +180,7 @@ public void testConversationPropagatedAjax() throws Exception { HtmlPage thunder = webClient.getPage(getPath("thunder.jsf", cid)); stormStrength = getFirstMatchingElement(thunder, HtmlTextInput.class, "stormStrength"); assertEquals(stormStrength.getValueAttribute(), AJAX_STORM_STRENGTH); - } + } } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ManualCidPropagationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ManualCidPropagationTest.java index 9e22333f1e..cbd2c1bc73 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ManualCidPropagationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/ManualCidPropagationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -41,7 +41,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(ManualCidPropagationTest.class) .withClasses(Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, - CloudController.class, OutermostFilter.class).withWebResource("cloud.xhtml") + CloudController.class, OutermostFilter.class) + .withWebResource("cloud.xhtml") .withWebResource("storm.xhtml").withWebResource("clouds.xhtml") .withWebResource("faces-config.xml", "/WEB-INF/faces-config.xml").withWebXml("web.xml").build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/OutermostFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/OutermostFilter.java index 72deee6e13..b58eb1ebf5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/OutermostFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/OutermostFilter.java @@ -44,18 +44,17 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha writeNonexistenConversationException(response); } } else { - try { - chain.doFilter(request, response); - } catch (NonexistentConversationException e) { - writeNonexistenConversationException(response); - } + try { + chain.doFilter(request, response); + } catch (NonexistentConversationException e) { + writeNonexistenConversationException(response); + } } } public void init(FilterConfig filterConfig) throws ServletException { } - private void writeNonexistenConversationException(ServletResponse response) throws IOException { response.setContentType("text/plain"); response.getWriter().print("NonexistentConversationException thrown properly\n"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Storm.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Storm.java index 84e8910304..0807729899 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Storm.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/Storm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncFooServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncFooServlet.java index 049284b8a9..9281c8610f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncFooServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncFooServlet.java @@ -25,7 +25,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - @WebServlet(value = { "/foo-async" }, asyncSupported = true) @SuppressWarnings("serial") public class AsyncFooServlet extends HttpServlet { @@ -63,7 +62,7 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws } else if (COMPLETE.equals(param)) { executorService.execute(new AsyncRequestProcessor(actx, 50l, false, null)); } else if (ERROR.equals(param)) { - executorService.execute(new AsyncRequestProcessor(actx, 50l, true, "/FailingServlet?cid="+cid)); + executorService.execute(new AsyncRequestProcessor(actx, 50l, true, "/FailingServlet?cid=" + cid)); } else if (LOOP.equals(param)) { if (inLoop) { executorService.execute(new AsyncRequestProcessor(actx, 50l, false, null)); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncRequestProcessor.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncRequestProcessor.java index bde1c59922..20b5492f75 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncRequestProcessor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/AsyncRequestProcessor.java @@ -14,11 +14,11 @@ package org.jboss.cdi.tck.tests.context.conversation.determination; +import jakarta.servlet.AsyncContext; + import org.jboss.cdi.tck.util.SimpleLogger; import org.jboss.cdi.tck.util.Timer; -import jakarta.servlet.AsyncContext; - /** * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BarFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BarFilter.java index 03a4a30cdf..8e115959dc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BarFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BarFilter.java @@ -28,7 +28,7 @@ /** * @author Martin Kouba - * + * */ @WebFilter(filterName = "BarFilter", urlPatterns = "/foo") public class BarFilter implements Filter { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BazRequestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BazRequestListener.java index 1c96644b64..5b469f7f94 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BazRequestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/BazRequestListener.java @@ -22,7 +22,7 @@ /** * @author Martin Kouba - * + * */ @WebListener public class BazRequestListener implements ServletRequestListener { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/ConversationDeterminationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/ConversationDeterminationTest.java index de85ca3dc1..be9d7cfa33 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/ConversationDeterminationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/ConversationDeterminationTest.java @@ -48,7 +48,7 @@ public static WebArchive createTestArchive() { @ArquillianResource private URL contextPath; - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = CONVERSATION_CONTEXT_EE, id = "da") @SpecAssertion(section = CONVERSATION_CONTEXT_EE, id = "db") @SpecAssertion(section = CONVERSATION_CONTEXT_EE, id = "dc") @@ -65,31 +65,31 @@ public void testConversationDetermination() throws Exception { assertTrue(cidPage.getContent().contains("transient: false")); // Test built-in conversation bean is available - TextPage resultPage = webClient.getPage(getContextPath(contextPath,"foo","test",cid)); + TextPage resultPage = webClient.getPage(getContextPath(contextPath, "foo", "test", cid)); assertTrue(resultPage.getContent().contains("testServlet=true")); assertTrue(resultPage.getContent().contains("testFilter=true")); assertTrue(resultPage.getContent().contains("testListener=true")); // Async listener - webClient.getPage(getContextPath(contextPath,"foo-async","complete",cid)); + webClient.getPage(getContextPath(contextPath, "foo-async", "complete", cid)); TextPage results = webClient.getPage(contextPath + "Status"); assertTrue(results.getContent().contains("onComplete: true")); - webClient.getPage(getContextPath(contextPath,"foo-async","timeout",cid)); + webClient.getPage(getContextPath(contextPath, "foo-async", "timeout", cid)); results = webClient.getPage(contextPath + "Status"); assertTrue(results.getContent().contains("onTimeout: true")); - webClient.getPage(getContextPath(contextPath,"foo-async","error",cid)); + webClient.getPage(getContextPath(contextPath, "foo-async", "error", cid)); results = webClient.getPage(contextPath + "Status"); assertTrue(results.getContent().contains("onError: true")); - webClient.getPage(getContextPath(contextPath,"foo-async","loop",cid)); + webClient.getPage(getContextPath(contextPath, "foo-async", "loop", cid)); results = webClient.getPage(contextPath + "Status"); assertTrue(results.getContent().contains("onStartAsync: true")); } - private String getContextPath(URL contextPath, String servlet, String param, String cid){ - return contextPath + servlet + "?action="+ param + "&cid=" + cid.trim(); + private String getContextPath(URL contextPath, String servlet, String param, String cid) { + return contextPath + servlet + "?action=" + param + "&cid=" + cid.trim(); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FailingServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FailingServlet.java index e16e29027b..bbea3d0235 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FailingServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FailingServlet.java @@ -13,14 +13,15 @@ */ package org.jboss.cdi.tck.tests.context.conversation.determination; -import org.jboss.cdi.tck.util.SimpleLogger; +import java.io.IOException; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; + +import org.jboss.cdi.tck.util.SimpleLogger; @SuppressWarnings("serial") @WebServlet(name = "FailingServlet", urlPatterns = { "/FailingServlet" }, asyncSupported = true) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FooServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FooServlet.java index 08d8e292cf..8b5ca87a07 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FooServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/FooServlet.java @@ -26,7 +26,7 @@ /** * @author Martin Kouba - * + * */ @WebServlet("/foo") public class FooServlet extends HttpServlet { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/QuxAsyncListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/QuxAsyncListener.java index 5137be11a3..ac30571534 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/QuxAsyncListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/QuxAsyncListener.java @@ -15,6 +15,7 @@ package org.jboss.cdi.tck.tests.context.conversation.determination; import java.io.IOException; + import jakarta.enterprise.context.Conversation; import jakarta.inject.Inject; import jakarta.servlet.AsyncEvent; @@ -22,7 +23,7 @@ /** * @author Martin Kouba - * + * */ public class QuxAsyncListener implements AsyncListener { @@ -58,7 +59,7 @@ public void onStartAsync(AsyncEvent event) throws IOException { statusBean.setOnStartAsync(checkSameConversationActive()); } - public boolean checkSameConversationActive(){ + public boolean checkSameConversationActive() { return FooServlet.CID.equals(conversation.getId()); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/StatusServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/StatusServlet.java index 210e2f5cd0..20545ea2b8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/StatusServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/StatusServlet.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.context.conversation.determination; import java.io.IOException; + import jakarta.inject.Inject; import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebServlet; @@ -40,6 +41,7 @@ private void writeInfo(ServletResponse response) throws IOException { public String getInfo() { return String .format("onStartAsync: %s, onError: %s, onTimeout: %s, onComplete: %s", - statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), statusBean.isOnComplete()); + statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), + statusBean.isOnComplete()); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/TestResult.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/TestResult.java index f0642d28a5..ffb90c40e4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/TestResult.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/determination/TestResult.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @RequestScoped public class TestResult { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ApplicationScopedObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ApplicationScopedObserver.java index d4f5b8d42e..c6de238a46 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ApplicationScopedObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ApplicationScopedObserver.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.context.conversation.event; import java.util.concurrent.atomic.AtomicBoolean; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.BeforeDestroyed; import jakarta.enterprise.context.ConversationScoped; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ConversationScopedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ConversationScopedBean.java index aef11c5df8..02930dc553 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ConversationScopedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/ConversationScopedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/LongRunningConversationLifecycleEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/LongRunningConversationLifecycleEventTest.java index 15c1cb404c..6c6de62e8e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/LongRunningConversationLifecycleEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/LongRunningConversationLifecycleEventTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -35,7 +35,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -51,7 +51,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(LongRunningConversationLifecycleEventTest.class) .withClasses(Servlet.class, ApplicationScopedObserver.class, ConversationScopedObserver.class, - ConversationScopedBean.class).build(); + ConversationScopedBean.class) + .build(); } @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/Servlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/Servlet.java index 85dd0738f1..1924b7e31e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/Servlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/Servlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/TransientConversationLifecycleEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/TransientConversationLifecycleEventTest.java index d8c76c9e8a..fb9f9bf92c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/TransientConversationLifecycleEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/TransientConversationLifecycleEventTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -35,7 +35,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -51,7 +51,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(TransientConversationLifecycleEventTest.class) .withClasses(Servlet.class, ConversationScopedObserver.class, ApplicationScopedObserver.class, - ConversationScopedBean.class).build(); + ConversationScopedBean.class) + .build(); } @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ConversationScopedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ConversationScopedBean.java index cf14cb27e6..b87d7dedbf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ConversationScopedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ConversationScopedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/DestroyConversationNotAssociatedWithCurrentRequestEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/DestroyConversationNotAssociatedWithCurrentRequestEventTest.java index 8ed79297a1..b632760b5c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/DestroyConversationNotAssociatedWithCurrentRequestEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/DestroyConversationNotAssociatedWithCurrentRequestEventTest.java @@ -34,7 +34,7 @@ /** * @author Martin Kouba - * + * */ @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") @@ -45,7 +45,8 @@ public class DestroyConversationNotAssociatedWithCurrentRequestEventTest extends @Deployment(testable = false) public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClassPackage(DestroyConversationNotAssociatedWithCurrentRequestEventTest.class).build(); + return new WebArchiveBuilder().withTestClassPackage(DestroyConversationNotAssociatedWithCurrentRequestEventTest.class) + .build(); } @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ObservingBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ObservingBean.java index d43aaa512c..b41e2eca6e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ObservingBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/ObservingBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/TestServlet.java index ed9ea81b5c..77966144b7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/event/notattached/TestServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/filter/ConversationFilterTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/filter/ConversationFilterTest.java index 35409ed521..95d85c4aec 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/filter/ConversationFilterTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/filter/ConversationFilterTest.java @@ -50,7 +50,7 @@ */ @SpecVersion(spec = "cdi", version = "2.0") public class ConversationFilterTest extends AbstractTest { - + private static final String JSESSIONID = "JSESSIONID"; @Deployment(testable = false) @@ -61,7 +61,8 @@ public static WebArchive createTestArchive() { Descriptors.create(WebAppDescriptor.class).createFilter().filterName(OuterFilter.class.getSimpleName()) .filterClass(OuterFilter.class.getName()).up().createFilterMapping() .filterName(OuterFilter.class.getSimpleName()).urlPattern("/*").up().createFilterMapping() - .filterName("CDI Conversation Filter").urlPattern("/*").up()).build(); + .filterName("CDI Conversation Filter").urlPattern("/*").up()) + .build(); } @ArquillianResource @@ -89,7 +90,8 @@ public void testConversationActivation() throws Exception { } /** - * "The container ensures that a long-running conversation may be associated with at most one request at a time, by blocking or rejecting concurrent requests." + * "The container ensures that a long-running conversation may be associated with at most one request at a time, by blocking + * or rejecting concurrent requests." * * In fact the spec doesn't require the container to reject the concurrent requests, but we don't expect it will block them * forever. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Message.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Message.java index 83521e9a63..958f543ab3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Message.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Message.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,12 +34,12 @@ public String getValue() { public void setValue(String value) { this.value = value; } - + @PostConstruct public void init() { ActionSequence.addAction("conversationCreated"); } - + @PreDestroy public void destroy() { ActionSequence.addAction("conversationDestroyed"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Servlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Servlet.java index 79977eeb57..f21344db65 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Servlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/Servlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/ServletConversationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/ServletConversationTest.java index 66c6ed3793..acd17a98ad 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/ServletConversationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/conversation/servlet/ServletConversationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; @@ -34,9 +33,9 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; -import org.testng.Assert; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; import com.gargoylesoftware.htmlunit.Page; import com.gargoylesoftware.htmlunit.TextPage; import com.gargoylesoftware.htmlunit.WebClient; @@ -46,7 +45,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlTextInput; /** - * + * * @author Jozef Hartinger * @author Martin Kouba */ @@ -177,20 +176,20 @@ public void testInvalidatingSessionDestroysConversation() throws Exception { { client.getPage(getPath("/invalidateSession", cid)); } - + TextPage sequence = client.getPage(getPath("/getSequence", null)); String result = sequence.getContent().trim(); - + // Construct expected result locally ActionSequence.reset(); ActionSequence.addAction(CONVERSATION_CREATED); ActionSequence.addAction(BEFORE_INVALIDATE); ActionSequence.addAction(AFTER_INVALIDATE); ActionSequence.addAction(CONVERSATION_DESTROYED); - + // Verify that the action sequence fetched from server is equal to the expected sequence assertEquals(result, ActionSequence.getSequence().dataToCsv()); - + // Additional verification that the conversation cannot be associated try { Page page = client.getPage(getPath("/display", cid)); @@ -209,13 +208,13 @@ public void testInvalidatingSessionDestroysAllLongRunningConversations() throws String firstCid = beginConversation(client, true); String secondCid = beginConversation(client, false); assertFalse(firstCid.equals(secondCid)); - + // Invalidate the session with one cid client.getPage(getPath("/invalidateSession", secondCid)); - + TextPage sequence = client.getPage(getPath("/getSequence", null)); String result = sequence.getContent().trim(); - + // Construct expected result locally // Two conv. should be created and both destroyed after invalidation ActionSequence.reset(); @@ -225,11 +224,11 @@ public void testInvalidatingSessionDestroysAllLongRunningConversations() throws ActionSequence.addAction(AFTER_INVALIDATE); ActionSequence.addAction(CONVERSATION_DESTROYED); ActionSequence.addAction(CONVERSATION_DESTROYED); - + // Verify that the action sequence fetched from server is equal to the expected sequence assertEquals(result, ActionSequence.getSequence().dataToCsv()); } - + protected String getCid(String content) { return content.substring(content.indexOf("cid: [") + 6, content.indexOf("]")); } @@ -271,7 +270,7 @@ protected Set getElements(HtmlElement rootElement, Class elementClass) return result; } - + protected String beginConversation(WebClient client, boolean resetSequence) throws IOException { if (resetSequence) { client.getPage(getPath("/resetSequence", null)); @@ -282,5 +281,5 @@ protected String beginConversation(WebClient client, boolean resetSequence) thro assertTrue(content.contains("transient: false")); return getCid(content); } - + } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/DependentContextEjbTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/DependentContextEjbTest.java index c9770958d2..59d239ce95 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/DependentContextEjbTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/DependentContextEjbTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -41,7 +41,7 @@ public static WebArchive createTestArchive() { .build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = DEPENDENT_DESTRUCTION_EE, id = "aaab") public void testDestroyingEjbDestroysDependents() throws Exception { assert getBeans(HouseLocal.class).size() == 1; @@ -58,7 +58,7 @@ public void testDestroyingEjbDestroysDependents() throws Exception { assert Table.destroyed; } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = DEPENDENT_DESTRUCTION_EE, id = "aaab") public void testDestroyingEjbDestroysDependentSimples() throws Exception { assert getBeans(FarmLocal.class).size() == 1; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Farm.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Farm.java index 7a1d0f7214..ef9d52d849 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Farm.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FarmLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FarmLocal.java index faf2d31dba..a60fdad673 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FarmLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FarmLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Fox.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Fox.java index 2e57330a6a..035a0f227f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Fox.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Fox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxLocal.java index 01cba8cb72..0b59721112 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRun.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRun.java index c1c66b5c29..223f594fdc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRun.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRun.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRunLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRunLocal.java index a94ab5b7df..16af910954 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRunLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/FoxRunLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Horse.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Horse.java index d82cdca09e..10ff88747e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Horse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Horse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,8 +20,8 @@ public class Horse implements Serializable { /** - * - */ + * + */ private static final long serialVersionUID = 1417245695143239294L; public static boolean destroyed; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/House.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/House.java index 9bc8210d60..13cfd7f9c4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/House.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/House.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/HouseLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/HouseLocal.java index 05e7289331..0e216170c2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/HouseLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/HouseLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Room.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Room.java index 5ae45ca605..ab6cba08ff 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Room.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Room.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/RoomLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/RoomLocal.java index d8504f132b..da97abdeb6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/RoomLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/RoomLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Stable.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Stable.java index a822869ef9..4f82b75e0a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Stable.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Stable.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,8 +21,8 @@ public class Stable implements Serializable { /** - * - */ + * + */ private static final long serialVersionUID = -5240670259345637799L; @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Table.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Table.java index bbfe7fd293..b4e30a1c2c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Table.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/Table.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/TableLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/TableLocal.java index c8f1b296ea..79f598897f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/TableLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/dependent/ejb/TableLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/AbstractMessageListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/AbstractMessageListener.java index a716110d3e..37444e6a9a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/AbstractMessageListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/AbstractMessageListener.java @@ -24,6 +24,7 @@ import jakarta.jms.TextMessage; import org.jboss.cdi.tck.util.SimpleLogger; + public class AbstractMessageListener implements MessageListener { public static AtomicInteger processedMessages = new AtomicInteger(0); @@ -62,6 +63,4 @@ public void postConstruct() { initialized.set(true); } - - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LogStore.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LogStore.java index 217720242b..1ca08bcde3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LogStore.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LogStore.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LoggerService.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LoggerService.java index 0aa6fc39a7..10c6861f0a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LoggerService.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/LoggerService.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ public void init() { } /** - * + * * @param text */ public void log(String text) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/MessageDrivenBeanContextTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/MessageDrivenBeanContextTest.java index 5f030f9b20..41a93b0861 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/MessageDrivenBeanContextTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/MessageDrivenBeanContextTest.java @@ -29,8 +29,8 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.impl.ConfigurationFactory; -import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.descriptors.ejb.EjbJarDescriptorBuilder; +import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.tests.context.jms.LogStore.LogMessage; import org.jboss.cdi.tck.util.Timer; import org.jboss.cdi.tck.util.Timer.StopCondition; @@ -61,7 +61,8 @@ public static WebArchive createTestArchive() { newMessageDriven("TestTopic", TopicMessageDrivenBean.class.getName()) .addActivationConfigProperty("acknowledgeMode", "Auto-acknowledge") .addActivationConfigProperty("destinationType", "jakarta.jms.Topic") - .addActivationConfigProperty("destinationLookup", ConfigurationFactory.get().getTestJmsTopic())).build(); + .addActivationConfigProperty("destinationLookup", ConfigurationFactory.get().getTestJmsTopic())) + .build(); return new WebArchiveBuilder().withTestClassPackage(MessageDrivenBeanContextTest.class).withEjbJarXml(ejbJarDescriptor) .build(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/SimpleMessageProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/SimpleMessageProducer.java index 98f5e34694..07dd60b188 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/SimpleMessageProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/jms/SimpleMessageProducer.java @@ -41,7 +41,8 @@ public class SimpleMessageProducer { @PostConstruct public void init() { - this.connectionFactory = (ConnectionFactory) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsConnectionFactory()); + this.connectionFactory = (ConnectionFactory) JndiLookupUtils + .lookup(ConfigurationFactory.get().getTestJmsConnectionFactory()); this.queue = (Queue) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsQueue()); this.topic = (Topic) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsTopic()); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java index 965fdda012..e2cb0bc464 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/EnterpriseBeanWithNonPassivatingDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION_EE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -38,7 +39,7 @@ public static WebArchive createTestArchive() { .withBeansXml(new BeansXml().decorators(MaarianhaminaDecorator.class)).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = PASSIVATION_VALIDATION_EE, id = "b") @SpecAssertion(section = PASSIVATION_VALIDATION_EE, id = "hb") public void testEnterpriseBeanWithNonPassivatingDecoratorFails() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianHaminaLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianHaminaLocal_Broken.java index 3655cef6dd..2d6f90b50f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianHaminaLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianHaminaLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianhaminaDecorator.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianhaminaDecorator.java index d755993442..8718b64c56 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianhaminaDecorator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/MaarianhaminaDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/Maarianhamina_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/Maarianhamina_Broken.java index b047bf7699..ef848c2646 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/Maarianhamina_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/Maarianhamina_Broken.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise; - -import jakarta.ejb.Remove; -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.SessionScoped; - -@Stateful -@SessionScoped -public class Maarianhamina_Broken implements MaarianHaminaLocal_Broken { - @Remove - public void bye() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise; + +import jakarta.ejb.Remove; +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.SessionScoped; + +@Stateful +@SessionScoped +public class Maarianhamina_Broken implements MaarianHaminaLocal_Broken { + @Remove + public void bye() { + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/BrokenDecorator.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/BrokenDecorator.java index 580dc98cee..82e4854762 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/BrokenDecorator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/BrokenDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/District.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/District.java index 601678a8fd..30f4b7adef 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/District.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/District.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise.field; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class District { - public void ping() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise.field; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class District { + public void ping() { + + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java index df913e8165..f29cc87e30 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInDecoratorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_VALIDATION_EE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -38,7 +39,7 @@ public static WebArchive createTestArchive() { .withBeansXml(new BeansXml().decorators(BrokenDecorator.class)).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = PASSIVATION_VALIDATION_EE, id = "bdd") public void testSessionBeanWithNonPassivatingInjectedFieldInDecoratorFails() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EspooLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EspooLocal_Broken.java index e0be3c00eb..b8c4394a52 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EspooLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/EspooLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/Espoo_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/Espoo_Broken.java index b121bc37fa..bced6d66e4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/Espoo_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/decorator/enterprise/field/Espoo_Broken.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise.field; - -import jakarta.ejb.Remove; -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.SessionScoped; - -@Stateful -@SessionScoped -public class Espoo_Broken implements EspooLocal_Broken { - @Remove - public void bye() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.decorator.enterprise.field; + +import jakarta.ejb.Remove; +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.SessionScoped; + +@Stateful +@SessionScoped +public class Espoo_Broken implements EspooLocal_Broken { + @Remove + public void bye() { + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/Cup_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/Cup_Broken.java index 859db3191d..6b01a628df 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/Cup_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/Cup_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/NonPassivationCapableEjbWithPassivatingScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/NonPassivationCapableEjbWithPassivatingScopeTest.java index 165330286f..131e3a5c65 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/NonPassivationCapableEjbWithPassivatingScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/NonPassivationCapableEjbWithPassivatingScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,11 +30,11 @@ /** * Verifies that a deployment which contains a non-passivation capable SFSB which is bound to a passivating context, is not * valid. - * + * *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/District.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/District.java index dae0364693..104a3638ef 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/District.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/District.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.enterprise.field; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class District { - - public void ping() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.enterprise.field; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class District { + + public void ping() { + + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/EspooLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/EspooLocal_Broken.java index e3cb0f04cb..812abecbeb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/EspooLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/EspooLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/Espoo_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/Espoo_Broken.java index c46ed024ed..fcc96bc142 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/Espoo_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/Espoo_Broken.java @@ -1,30 +1,30 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.enterprise.field; - -import jakarta.ejb.Remove; -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@Stateful -@SessionScoped -public class Espoo_Broken implements EspooLocal_Broken { - @Inject - District district; - - @Remove - public void bye() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.enterprise.field; + +import jakarta.ejb.Remove; +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@Stateful +@SessionScoped +public class Espoo_Broken implements EspooLocal_Broken { + @Inject + District district; + + @Remove + public void bye() { + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java index a717ca5bf4..6c112a2ca1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/enterprise/field/UnserializableSimpleInjectedIntoPassivatingEnterpriseBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Digital.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Digital.java index c43111ca8c..6e2987ff9d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Digital.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Digital.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/DigitalInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/DigitalInterceptor.java index 73680af377..88838f95b7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/DigitalInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/DigitalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java index 1f45f195ae..28249113c9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/EnterpriseBeanWithNonPassivatingInterceptorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,8 +23,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; @@ -41,7 +39,7 @@ public static WebArchive createTestArchive() { .withBeansXml(new BeansXml().interceptors(DigitalInterceptor.class)).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = PASSIVATION_VALIDATION_EE, id = "b") @SpecAssertion(section = PASSIVATION_VALIDATION_EE, id = "hd") public void testEnterpriseBeanWithNonPassivatingDecoratorFails() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Telephone.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Telephone.java index 442795ddb2..e7d62cf82d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Telephone.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/Telephone.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/BrokenInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/BrokenInterceptor.java index 27f090e883..716a3f4852 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/BrokenInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/BrokenInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/District.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/District.java index ac7d87389c..f310dbd80c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/District.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/District.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.interceptor.enterprise.field; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class District { - public void ping() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.interceptor.enterprise.field; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class District { + public void ping() { + + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java index 4c0aee843e..3e034ca6cf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -37,7 +37,7 @@ public static WebArchive createTestArchive() { EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.class).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = PASSIVATION_VALIDATION_EE, id = "bda") // WBRI-361 public void testSessionBeanWithNonPassivatingInjectedFieldInInterceptorFails() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EspooLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EspooLocal_Broken.java index 75a3d38603..64c04ef74d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EspooLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/EspooLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/Espoo_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/Espoo_Broken.java index d1924fd06b..8e7718a070 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/Espoo_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/interceptor/enterprise/field/Espoo_Broken.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.interceptor.enterprise.field; - -import jakarta.ejb.Remove; -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.SessionScoped; -import jakarta.interceptor.Interceptors; - -@Stateful -@SessionScoped -@Interceptors(BrokenInterceptor.class) -public class Espoo_Broken implements EspooLocal_Broken { - @Remove - public void bye() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.interceptor.enterprise.field; + +import jakarta.ejb.Remove; +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.SessionScoped; +import jakarta.interceptor.Interceptors; + +@Stateful +@SessionScoped +@Interceptors(BrokenInterceptor.class) +public class Espoo_Broken implements EspooLocal_Broken { + @Remove + public void bye() { + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/British.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/British.java index 870bd8fff1..c2e64d48d9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/British.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/British.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.producer.field.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Qualifier -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -public @interface British { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.producer.field.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Qualifier +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +public @interface British { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/ConstructorInjectionCorralBroken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/ConstructorInjectionCorralBroken.java index a654fea1b7..f3d15df1cd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/ConstructorInjectionCorralBroken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/ConstructorInjectionCorralBroken.java @@ -23,14 +23,15 @@ public class ConstructorInjectionCorralBroken extends Corral { private Cow cow; - public ConstructorInjectionCorralBroken(){} + public ConstructorInjectionCorralBroken() { + } @Inject - public ConstructorInjectionCorralBroken(@British Cow cow){ - this.cow = cow; + public ConstructorInjectionCorralBroken(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Corral.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Corral.java index 5950755f88..042ccd6567 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Corral.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Corral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,6 +19,4 @@ public abstract class Corral implements Serializable { public abstract void ping(); - - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Cow.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Cow.java index 4eb9717f7d..9d11c4eed3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Cow.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/CowProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/CowProducer.java index 235ce1f606..ccee0eabf7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/CowProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/CowProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/EnterpriseBeanWithIllegalDependencyTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/EnterpriseBeanWithIllegalDependencyTest.java index dc822f0552..a0ee091df0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/EnterpriseBeanWithIllegalDependencyTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/EnterpriseBeanWithIllegalDependencyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/FieldInjectionCorralBroken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/FieldInjectionCorralBroken.java index c6c78296ed..82b4ba5812 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/FieldInjectionCorralBroken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/FieldInjectionCorralBroken.java @@ -1,31 +1,31 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.producer.field.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@SuppressWarnings("serial") -@Stateful -@SessionScoped -public class FieldInjectionCorralBroken extends Corral { - - @Inject - @British - Cow cow; - - public void ping() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.producer.field.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@SuppressWarnings("serial") +@Stateful +@SessionScoped +public class FieldInjectionCorralBroken extends Corral { + + @Inject + @British + Cow cow; + + public void ping() { + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/SetterInjectionCorralBroken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/SetterInjectionCorralBroken.java index f27de3bcc5..301e9c7a3a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/SetterInjectionCorralBroken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/field/enterprise/SetterInjectionCorralBroken.java @@ -24,10 +24,10 @@ public class SetterInjectionCorralBroken extends Corral { private Cow cow; @Inject - public void setCow(@British Cow cow){ - this.cow = cow; + public void setCow(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/British.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/British.java index 0b5e4dd549..e1187d33f9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/British.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/British.java @@ -1,38 +1,38 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.producer.method.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.util.AnnotationLiteral; -import jakarta.inject.Qualifier; - -@Qualifier -@Target({ FIELD, PARAMETER, METHOD, TYPE }) -@Retention(RUNTIME) -public @interface British { - - public static class BritishLiteral extends AnnotationLiteral implements British{ - - public static British INSTANCE = new BritishLiteral(); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.producer.method.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.util.AnnotationLiteral; +import jakarta.inject.Qualifier; + +@Qualifier +@Target({ FIELD, PARAMETER, METHOD, TYPE }) +@Retention(RUNTIME) +public @interface British { + + public static class BritishLiteral extends AnnotationLiteral implements British { + + public static British INSTANCE = new BritishLiteral(); + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ConstructorInjectionCorralBroken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ConstructorInjectionCorralBroken.java index a205a675d1..2cc6a83d1f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ConstructorInjectionCorralBroken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ConstructorInjectionCorralBroken.java @@ -23,14 +23,15 @@ public class ConstructorInjectionCorralBroken extends Ranch { private Cow cow; - public ConstructorInjectionCorralBroken(){} + public ConstructorInjectionCorralBroken() { + } @Inject - public ConstructorInjectionCorralBroken(@British Cow cow){ - this.cow = cow; + public ConstructorInjectionCorralBroken(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Cow.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Cow.java index a4cf9cee1f..ecfd283d9b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Cow.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/CowProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/CowProducer.java index cfcb5d6b66..ec7488012d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/CowProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/CowProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/EnterpriseBeanWithIllegalDependencyTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/EnterpriseBeanWithIllegalDependencyTest.java index acf5d13520..8bf967fefa 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/EnterpriseBeanWithIllegalDependencyTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/EnterpriseBeanWithIllegalDependencyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/FieldInjectionCorralBroken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/FieldInjectionCorralBroken.java index 8810044e04..d7e6c7c150 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/FieldInjectionCorralBroken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/FieldInjectionCorralBroken.java @@ -1,30 +1,30 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.broken.producer.method.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.SessionScoped; -import jakarta.inject.Inject; - -@Stateful -@SessionScoped -public class FieldInjectionCorralBroken extends Ranch { - - @Inject - @British - Cow cow; - - public void ping() { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.broken.producer.method.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; + +@Stateful +@SessionScoped +public class FieldInjectionCorralBroken extends Ranch { + + @Inject + @British + Cow cow; + + public void ping() { + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Herd.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Herd.java index 1f49aba98f..f801d9f88b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Herd.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Herd.java @@ -13,7 +13,8 @@ */ package org.jboss.cdi.tck.tests.context.passivating.broken.producer.method.enterprise; -public class Herd extends Ranch{ - - public void ping(){} +public class Herd extends Ranch { + + public void ping() { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ProducerMethodParamInjectionCorralBroken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ProducerMethodParamInjectionCorralBroken.java index a3a4924aca..30f788fbbe 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ProducerMethodParamInjectionCorralBroken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/ProducerMethodParamInjectionCorralBroken.java @@ -22,13 +22,13 @@ public class ProducerMethodParamInjectionCorralBroken extends Ranch { @Override public void ping() { - + } - + @Produces @British @SessionScoped - public Herd produce(@British Cow cow){ - return new Herd(); + public Herd produce(@British Cow cow) { + return new Herd(); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Ranch.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Ranch.java index 7b3b46d58b..001bc24e00 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Ranch.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/Ranch.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/SetterInjectionCorralBroken.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/SetterInjectionCorralBroken.java index 51133555ca..e81eabe7e2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/SetterInjectionCorralBroken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/broken/producer/method/enterprise/SetterInjectionCorralBroken.java @@ -24,10 +24,10 @@ public class SetterInjectionCorralBroken extends Ranch { private Cow cow; @Inject - public void setCow(@British Cow cow){ - this.cow = cow; + public void setCow(@British Cow cow) { + this.cow = cow; } - - public void ping(){ + + public void ping() { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Another.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Another.java index a7be9e2020..4dc7c767d7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Another.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Another.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.context.passivating.dependency.resource.persistence; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Another { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.context.passivating.dependency.resource.persistence; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Another { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourcePassivationDependencyTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourcePassivationDependencyTest.java index add31220a4..b42e81a564 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourcePassivationDependencyTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourcePassivationDependencyTest.java @@ -51,7 +51,8 @@ public static WebArchive createTestArchive() { .withWebXml( Descriptors.create(WebAppDescriptor.class).createResourceRef().resRefName("jdbc/TestDB") .resType(DataSource.class.getName()).lookupName(ConfigurationFactory.get().getTestDataSource()) - .up()).withDefaultPersistenceXml().build(); + .up()) + .withDefaultPersistenceXml().build(); } @Test(groups = { PERSISTENCE, INTEGRATION }) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourceProducer.java index ccf4ba0c41..ab9930bba1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/DataSourceProducer.java @@ -13,17 +13,18 @@ */ package org.jboss.cdi.tck.tests.context.passivating.dependency.resource.persistence; +import javax.sql.DataSource; + import jakarta.annotation.Resource; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Produces; -import javax.sql.DataSource; @Dependent public class DataSourceProducer { @Produces @Another - @Resource(name="jdbc/TestDB") + @Resource(name = "jdbc/TestDB") DataSource dataSource; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Pool.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Pool.java index 89e9d51b60..8602584169 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Pool.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/persistence/Pool.java @@ -16,10 +16,11 @@ import java.io.Serializable; import java.util.UUID; +import javax.sql.DataSource; + import jakarta.annotation.PostConstruct; import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Inject; -import javax.sql.DataSource; @SessionScoped public class Pool implements Serializable { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/remote/ejb/FooBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/remote/ejb/FooBean.java index 43fc763ed6..86d70cfbb8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/remote/ejb/FooBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/resource/remote/ejb/FooBean.java @@ -35,6 +35,4 @@ public String getId() { return id; } - - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/sessionbean/SessionBeanPassivationDependencyTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/sessionbean/SessionBeanPassivationDependencyTest.java index 472146ed9f..76df37b754 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/sessionbean/SessionBeanPassivationDependencyTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/dependency/sessionbean/SessionBeanPassivationDependencyTest.java @@ -48,7 +48,7 @@ public static WebArchive createTestArchive() { @Inject Chef chef; - @Test(groups=INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = PASSIVATION_CAPABLE_DEPENDENCY_EE, id = "ab") public void testSingleton() throws IOException, ClassNotFoundException { assertNotNull(worker); @@ -66,7 +66,7 @@ public void testSingleton() throws IOException, ClassNotFoundException { assertEquals(workerCopy.getHammer().getId(), hammerId); } - @Test(groups=INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = PASSIVATION_CAPABLE_DEPENDENCY_EE, id = "aa") public void testStateless() throws IOException, ClassNotFoundException { assertNotNull(chef); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Digital.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Digital.java index 3bb1fdac7f..e869e5b2fa 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Digital.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Digital.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/DigitalInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/DigitalInterceptor.java index 45541c2422..ce2b25294c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/DigitalInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/DigitalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java index b51ffa4fa3..3483f63575 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/NonPassivationCapableSessionBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,8 +20,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; @@ -30,11 +28,11 @@ /** * Verifies that a deployment which contains a non-passivation capable SFSB which is not bound to a passivating context, is * valid. - * + * *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Telephone.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Telephone.java index 0d206d4615..1c534723d3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Telephone.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/Telephone.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/TelephoneLine.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/TelephoneLine.java index 694a2bd576..79532df3ef 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/TelephoneLine.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/TelephoneLine.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Digital.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Digital.java index ee83b3c3e7..98c591ec21 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Digital.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Digital.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/DigitalInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/DigitalInterceptor.java index 3bd3e4e165..99cf7d8976 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/DigitalInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/DigitalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java index a3332fd09d..cd8ce7e9dd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/StatefulSessionBeanTest.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.PASSIVATION_CAPABLE_EE; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Telephone.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Telephone.java index 9260077a57..db4b105f30 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Telephone.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/Telephone.java @@ -18,7 +18,7 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.inject.Inject; -@Stateful(passivationCapable=false) +@Stateful(passivationCapable = false) @SessionScoped @Digital public class Telephone { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/TelephoneLine.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/TelephoneLine.java index cc7ff74f97..f604b1cc8d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/TelephoneLine.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/invalid/TelephoneLine.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.context.passivating.enterprise.invalid; -import jakarta.enterprise.context.Dependent; - import java.io.Serializable; +import jakarta.enterprise.context.Dependent; + @SuppressWarnings("serial") @Dependent public class TelephoneLine implements Serializable { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Digital.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Digital.java index d411286394..a924103dc3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Digital.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Digital.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/DigitalInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/DigitalInterceptor.java index 37e44805b5..d39fbdcd1e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/DigitalInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/DigitalInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/ElephantLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/ElephantLocal.java index 29cd33c4f5..10125ba770 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/ElephantLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/ElephantLocal.java @@ -13,8 +13,8 @@ */ package org.jboss.cdi.tck.tests.context.passivating.enterprise.valid; -public interface ElephantLocal{ +public interface ElephantLocal { void remove(); - + } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Telephone.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Telephone.java index c289991e84..46a1abe77a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Telephone.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/Telephone.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/TelephoneLine.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/TelephoneLine.java index 5fea5b244a..761ee0303e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/TelephoneLine.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/passivating/enterprise/valid/TelephoneLine.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.context.passivating.enterprise.valid; -import jakarta.enterprise.context.Dependent; - import java.io.Serializable; +import jakarta.enterprise.context.Dependent; + @SuppressWarnings("serial") @Dependent public class TelephoneLine implements Serializable { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/SimpleRequestBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/SimpleRequestBean.java index 040cc2b422..d1b8d1875a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/SimpleRequestBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/SimpleRequestBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestFilter.java index 821227ed10..b492b00d9b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestFilter.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestServletRequestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestServletRequestListener.java index e71bc31575..22bda9ac6f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestServletRequestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/TestServletRequestListener.java @@ -51,7 +51,7 @@ public void requestDestroyed(ServletRequestEvent sre) { @Override public void requestInitialized(ServletRequestEvent sre) { - logger.log("Request initialized..."); + logger.log("Request initialized..."); checkRequestContextActive(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/RequestContextAsyncListenerTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/RequestContextAsyncListenerTest.java index 457cca1df6..10ded95864 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/RequestContextAsyncListenerTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/RequestContextAsyncListenerTest.java @@ -20,9 +20,8 @@ import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertTrue; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; import java.net.URL; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; @@ -33,6 +32,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + /** * * @author Martin Kouba @@ -49,7 +51,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(RequestContextAsyncListenerTest.class).build(); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "ad") @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "bd") public void testRequestContextActiveOnComplete() throws Exception { @@ -68,7 +70,7 @@ public void testRequestContextActiveOnComplete() throws Exception { extractSimpleRequestBeanIdString(results2.getContent())); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "ad") public void testRequestContextActiveOnTimeout() throws Exception { WebClient webClient = new WebClient(); @@ -79,7 +81,7 @@ public void testRequestContextActiveOnTimeout() throws Exception { assertTrue(results.getContent().contains("onTimeout: true")); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "ad") public void testRequestContextActiveOnError() throws Exception { WebClient webClient = new WebClient(); @@ -89,7 +91,7 @@ public void testRequestContextActiveOnError() throws Exception { assertTrue(results.getContent().contains("onError: true")); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "ad") public void testRequestContextActiveOnStartAsync() throws Exception { WebClient webClient = new WebClient(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/SimpleAsyncListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/SimpleAsyncListener.java index b1f4aa3f61..26ebebd4b8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/SimpleAsyncListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/SimpleAsyncListener.java @@ -15,11 +15,13 @@ package org.jboss.cdi.tck.tests.context.request.async; import java.io.IOException; + import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncListener; + import org.jboss.cdi.tck.util.SimpleLogger; /** diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusBean.java index d8e0d6e2a2..68fb859d7c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusBean.java @@ -64,7 +64,7 @@ public void setOnTimeout(boolean onTimeout) { this.onTimeout = onTimeout; } - public void reset(){ + public void reset() { this.onComplete = false; this.onStartAsync = false; this.onTimeout = false; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusServlet.java index d2b5bfb5da..571a216519 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/async/StatusServlet.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.context.request.async; import java.io.IOException; + import jakarta.inject.Inject; import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebServlet; @@ -40,6 +41,7 @@ private void writeInfo(ServletResponse response) throws IOException { public String getInfo() { return String .format("onStartAsync: %s, onError: %s, onTimeout: %s, onComplete: %s, simpleRequestBeanId: %s", - statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), statusBean.isOnComplete(), statusBean.getRequestBeanId()); + statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), + statusBean.isOnComplete(), statusBean.getRequestBeanId()); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/BarBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/BarBean.java index ce72f12d40..fcbe1e8795 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/BarBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/BarBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -36,7 +36,7 @@ public class BarBean { /** * Async computation. - * + * * @return */ public Future compute() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMS.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMS.java index b17e3d33f1..51b8ccd975 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMS.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMS.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMSModelIII.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMSModelIII.java index 87eca66b55..64b5832312 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMSModelIII.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FMSModelIII.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooBean.java index 03021e561f..26a95067ed 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRemote.java index 46045e4065..d1fd80b7b0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRequestBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRequestBean.java index 831716765a..210156bae5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRequestBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/FooRequestBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/SimpleRequestBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/SimpleRequestBean.java index e34511f38a..334a0a8d38 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/SimpleRequestBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/ejb/SimpleRequestBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/ObservingBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/ObservingBean.java index a35be1881e..9e3b19c277 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/ObservingBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/ObservingBean.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.context.request.event; import java.util.concurrent.atomic.AtomicInteger; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.BeforeDestroyed; import jakarta.enterprise.context.Destroyed; @@ -36,8 +37,8 @@ public void observeRequestInitialized(@Observes @Initialized(RequestScoped.class initializedRequestCount.incrementAndGet(); } - public void observeBeforeDestroyed(@Observes @BeforeDestroyed(RequestScoped.class) ServletRequest event){ - beforeDestroyedRequestCount.incrementAndGet(); + public void observeBeforeDestroyed(@Observes @BeforeDestroyed(RequestScoped.class) ServletRequest event) { + beforeDestroyedRequestCount.incrementAndGet(); } public void observeRequestDestroyed(@Observes @Destroyed(RequestScoped.class) ServletRequest event) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/RequestScopeEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/RequestScopeEventTest.java index 119295dd8e..28c1e5d349 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/RequestScopeEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/RequestScopeEventTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -36,7 +36,7 @@ *

    * This test was originally part of Weld test suite. *

    - * + * * @author Jozef Hartinger * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/Servlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/Servlet.java index eb4b47b57b..e1d89fe59a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/Servlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/Servlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/ApplicationScopedObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/ApplicationScopedObserver.java index 091f9a7efa..4441aa4ac3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/ApplicationScopedObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/ApplicationScopedObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/InfoServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/InfoServlet.java index 2f0cd8e935..94a10eefbb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/InfoServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/async/InfoServlet.java @@ -28,7 +28,7 @@ * @author Martin Kouba */ @SuppressWarnings("serial") -@WebServlet(value="/info") +@WebServlet(value = "/info") public class InfoServlet extends HttpServlet { @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/ApplicationScopedObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/ApplicationScopedObserver.java index b0124093ee..ea79abeeea 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/ApplicationScopedObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/ApplicationScopedObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/RequestScopeEventMessageDeliveryTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/RequestScopeEventMessageDeliveryTest.java index fbd218408f..255480c7fd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/RequestScopeEventMessageDeliveryTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/RequestScopeEventMessageDeliveryTest.java @@ -22,13 +22,14 @@ import static org.testng.Assert.assertTrue; import java.util.concurrent.TimeUnit; + import jakarta.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.impl.ConfigurationFactory; -import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.descriptors.ejb.EjbJarDescriptorBuilder; +import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.util.Timer; import org.jboss.cdi.tck.util.Timer.StopCondition; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -82,7 +83,8 @@ public boolean isSatisfied() { new Timer().setDelay(5, TimeUnit.SECONDS).addStopCondition(new StopCondition() { public boolean isSatisfied() { - return AbstractMessageListener.isInitializedEventObserver() && AbstractMessageListener.getProcessedMessages() >= 1; + return AbstractMessageListener.isInitializedEventObserver() + && AbstractMessageListener.getProcessedMessages() >= 1; } }).start(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/SimpleMessageProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/SimpleMessageProducer.java index ac662763f8..44b1275506 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/SimpleMessageProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/jms/SimpleMessageProducer.java @@ -38,7 +38,8 @@ public class SimpleMessageProducer { @PostConstruct public void init() { - this.connectionFactory = (ConnectionFactory) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsConnectionFactory()); + this.connectionFactory = (ConnectionFactory) JndiLookupUtils + .lookup(ConfigurationFactory.get().getTestJmsConnectionFactory()); this.topic = (Topic) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsTopic()); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/ApplicationScopedObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/ApplicationScopedObserver.java index 8ffb2c5ffa..d42f916811 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/ApplicationScopedObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/ApplicationScopedObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooBean.java index 7f6a9d9084..deb6e77110 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooRemote.java index a34a58a013..cba2988b1a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/FooRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopeEventRemoteTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopeEventRemoteTest.java index 3f3ceb82ac..2617774d27 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopeEventRemoteTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopeEventRemoteTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,7 @@ /** * Clarification for request context lifecycle during remote method invocation of EJB is required - see CDI-180. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -54,7 +54,7 @@ public static EnterpriseArchive createEjbArchive() { FooRemote foo; @OperateOnDeployment("TEST") - @Test(groups = JAVAEE_FULL) + @Test(groups = JAVAEE_FULL) @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "jc") public void testRequestScopeActiveDuringRemoteCallToEjb() throws Exception { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopedObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopedObserver.java index 717db73a90..4061663b21 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopedObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/remote/RequestScopedObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/ApplicationScopedObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/ApplicationScopedObserver.java index ac91bf6056..dce1ce15af 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/ApplicationScopedObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/ApplicationScopedObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopeEventTimeoutTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopeEventTimeoutTest.java index 0dbbd3ebb5..474d9a8e14 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopeEventTimeoutTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopeEventTimeoutTest.java @@ -37,7 +37,7 @@ /** * @author Martin Kouba - * + * */ @Test(groups = JAVAEE_FULL) @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopedObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopedObserver.java index d95c4b31c6..ba8177f1cc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopedObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/event/timeout/RequestScopedObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/Foo.java index 3aa8af9380..31e0b5cf1f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/Foo.java @@ -6,18 +6,19 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.context.request.jaxrs; +import java.util.concurrent.atomic.AtomicLong; + import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; -import java.util.concurrent.atomic.AtomicLong; @RequestScoped public class Foo { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/FooResource.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/FooResource.java index d5adcdf483..356d6c41d9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/FooResource.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/FooResource.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/InfoServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/InfoServlet.java index 7f001d6702..c6557f9b16 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/InfoServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/InfoServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/RequestContextTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/RequestContextTest.java index ce58b664f5..cf68c35fc6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/RequestContextTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/jaxrs/RequestContextTest.java @@ -49,7 +49,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(RequestContextTest.class).withClass(JaxRsActivator.class).build(); } - @Test(groups = { INTEGRATION, JAX_RS}) + @Test(groups = { INTEGRATION, JAX_RS }) @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "b") @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "d") @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "jb") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/Action.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/Action.java index 9832d9bb8f..93c4e04215 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/Action.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/Action.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @RequestScoped public class Action { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingleton.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingleton.java index c55eb7adb1..13828dbaca 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingleton.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingleton.java @@ -24,7 +24,7 @@ /** * @author Martin Kouba - * + * */ @Startup @Singleton diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonInfoServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonInfoServlet.java index 29acf461c4..55350d8849 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonInfoServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonInfoServlet.java @@ -26,7 +26,7 @@ /** * @author Martin Kouba - * + * */ @SuppressWarnings("serial") @WebServlet("/eager") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonPostConstructCallbackTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonPostConstructCallbackTest.java index 49c4b923c5..094506793d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonPostConstructCallbackTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/EagerSingletonPostConstructCallbackTest.java @@ -34,9 +34,9 @@ /** * Test the request context is active during @PostConstruct callback of an eager singleton. - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class EagerSingletonPostConstructCallbackTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/RequestContextObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/RequestContextObserver.java index 14b3db7057..d83792ef49 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/RequestContextObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/RequestContextObserver.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @ApplicationScoped public class RequestContextObserver { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBean.java index bbafceee85..39b47681cd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBean.java @@ -22,7 +22,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class SimpleBean { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBeanPostConstructCallbackTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBeanPostConstructCallbackTest.java index d943f8e932..95cb3f7497 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBeanPostConstructCallbackTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleBeanPostConstructCallbackTest.java @@ -35,9 +35,9 @@ /** * Test the request context is active during @PostConstruct callback of a simple bean. - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SimpleBeanPostConstructCallbackTest extends AbstractTest { @@ -52,7 +52,8 @@ public static WebArchive createTestArchive() { private URL contextPath; @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = REQUEST_CONTEXT, id = "db"), @SpecAssertion(section = REQUEST_CONTEXT, id = "eb") }) + @SpecAssertions({ @SpecAssertion(section = REQUEST_CONTEXT, id = "db"), + @SpecAssertion(section = REQUEST_CONTEXT, id = "eb") }) public void testSimplePostConstructCallback() throws Exception { WebClient client = new WebClient(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleInfoServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleInfoServlet.java index 62a06e48c4..ece42e430b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleInfoServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/request/postconstruct/SimpleInfoServlet.java @@ -28,7 +28,7 @@ /** * @author Martin Kouba - * + * */ @SuppressWarnings("serial") @WebServlet("/simple") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectFilter.java index 0433328bfb..d12d0b13bf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectFilter.java @@ -32,23 +32,23 @@ @WebFilter(filterName = "IntrospectFilter", urlPatterns = "/introspect") public class IntrospectFilter implements Filter { - private static final SimpleLogger logger = new SimpleLogger( - IntrospectFilter.class); + private static final SimpleLogger logger = new SimpleLogger( + IntrospectFilter.class); - public void destroy() { - } + public void destroy() { + } - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - logger.log("Do filter..."); - chain.doFilter(request, response); - String mode = request.getParameter("mode"); + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + logger.log("Do filter..."); + chain.doFilter(request, response); + String mode = request.getParameter("mode"); if (IntrospectServlet.MODE_INVALIDATE.equals(mode)) { ActionSequence.addAction(IntrospectFilter.class.getName()); } - } + } - public void init(FilterConfig filterConfig) throws ServletException { - } + public void init(FilterConfig filterConfig) throws ServletException { + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectHttpSessionListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectHttpSessionListener.java index 495ae80e2c..75609536c7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectHttpSessionListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectHttpSessionListener.java @@ -26,18 +26,18 @@ @WebListener public class IntrospectHttpSessionListener implements HttpSessionListener { - private static final SimpleLogger logger = new SimpleLogger( - IntrospectHttpSessionListener.class); + private static final SimpleLogger logger = new SimpleLogger( + IntrospectHttpSessionListener.class); - @Override - public void sessionCreated(HttpSessionEvent se) { - logger.log("Session created..."); - } + @Override + public void sessionCreated(HttpSessionEvent se) { + logger.log("Session created..."); + } - @Override - public void sessionDestroyed(HttpSessionEvent se) { - logger.log("Session destroyed..."); - ActionSequence.addAction(IntrospectHttpSessionListener.class.getName()); - } + @Override + public void sessionDestroyed(HttpSessionEvent se) { + logger.log("Session destroyed..."); + ActionSequence.addAction(IntrospectHttpSessionListener.class.getName()); + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServlet.java index 687fcbe0e0..555bd7a596 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServlet.java @@ -34,40 +34,40 @@ @WebServlet(name = "IntrospectServlet", urlPatterns = "/introspect") public class IntrospectServlet extends HttpServlet { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - public static final String MODE_INVALIDATE = "invalidate"; + public static final String MODE_INVALIDATE = "invalidate"; - public static final String MODE_VERIFY = "verify"; + public static final String MODE_VERIFY = "verify"; - public static final String MODE_TIMEOUT = "timeout"; + public static final String MODE_TIMEOUT = "timeout"; - @Inject - SimpleSessionBean simpleBean; + @Inject + SimpleSessionBean simpleBean; - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { - resp.setContentType("text/text"); - String mode = req.getParameter("mode"); + resp.setContentType("text/text"); + String mode = req.getParameter("mode"); - if (mode == null) { - resp.getWriter().append(simpleBean.getId()); - } else if (MODE_INVALIDATE.equals(mode)) { - ActionSequence.reset(); - ActionSequence.addAction(IntrospectServlet.class.getName()); - req.getSession().invalidate(); - } else if (MODE_VERIFY.equals(mode)) { - resp.setStatus(HttpServletResponse.SC_OK); - resp.setContentType("text/plain"); - resp.getWriter().write(ActionSequence.getSequence().toString()); - } else if (MODE_TIMEOUT.equals(mode)) { - ActionSequence.reset(); - req.getSession().setMaxInactiveInterval(1); - } else { - throw new ServletException("Unknown mode"); - } - } + if (mode == null) { + resp.getWriter().append(simpleBean.getId()); + } else if (MODE_INVALIDATE.equals(mode)) { + ActionSequence.reset(); + ActionSequence.addAction(IntrospectServlet.class.getName()); + req.getSession().invalidate(); + } else if (MODE_VERIFY.equals(mode)) { + resp.setStatus(HttpServletResponse.SC_OK); + resp.setContentType("text/plain"); + resp.getWriter().write(ActionSequence.getSequence().toString()); + } else if (MODE_TIMEOUT.equals(mode)) { + ActionSequence.reset(); + req.getSession().setMaxInactiveInterval(1); + } else { + throw new ServletException("Unknown mode"); + } + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServletRequestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServletRequestListener.java index cf7c8bacba..1bb1c5abea 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServletRequestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/IntrospectServletRequestListener.java @@ -27,21 +27,21 @@ @WebListener public class IntrospectServletRequestListener implements ServletRequestListener { - private static final SimpleLogger logger = new SimpleLogger( - IntrospectServletRequestListener.class); + private static final SimpleLogger logger = new SimpleLogger( + IntrospectServletRequestListener.class); - @Override - public void requestDestroyed(ServletRequestEvent sre) { - logger.log("Request destroyed..."); - String mode = sre.getServletRequest().getParameter("mode"); - if (IntrospectServlet.MODE_INVALIDATE.equals(mode)) { - ActionSequence.addAction(IntrospectServletRequestListener.class - .getName()); - } - } + @Override + public void requestDestroyed(ServletRequestEvent sre) { + logger.log("Request destroyed..."); + String mode = sre.getServletRequest().getParameter("mode"); + if (IntrospectServlet.MODE_INVALIDATE.equals(mode)) { + ActionSequence.addAction(IntrospectServletRequestListener.class + .getName()); + } + } - @Override - public void requestInitialized(ServletRequestEvent sre) { - // No-op - } + @Override + public void requestInitialized(ServletRequestEvent sre) { + // No-op + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SessionContextTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SessionContextTest.java index 644c91a51e..3b4ba65e9c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SessionContextTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SessionContextTest.java @@ -39,123 +39,123 @@ @SpecVersion(spec = "cdi", version = "2.0") public class SessionContextTest extends AbstractTest { - private static final long DEFAULT_SLEEP_INTERVAL = 3000; - - @ArquillianResource - private URL contextPath; - - @Deployment(testable = false) - public static WebArchive createTestArchive() { - return new WebArchiveBuilder() - .withTestClassPackage(SessionContextTest.class) - .withWebResource("SimplePage.html", "SimplePage.html").build(); - } - - @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "aa"), - @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ae") }) - public void testSessionScopeActiveDuringServiceMethod() throws Exception { - WebClient webClient = new WebClient(); - webClient.getPage(contextPath + "test"); - } - - @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ab"), - @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ae") }) - public void testSessionScopeActiveDuringDoFilterMethod() throws Exception { - WebClient webClient = new WebClient(); - webClient.getPage(contextPath + "SimplePage.html"); - } - - @Test(groups = INTEGRATION) - @SpecAssertion(section = SESSION_CONTEXT_EE, id = "b") - public void testSessionContextSharedBetweenServletRequestsInSameHttpSession() - throws Exception { - WebClient webClient = new WebClient(); - TextPage firstRequestResult = webClient.getPage(contextPath - + "introspect"); - assertNotNull(firstRequestResult.getContent()); - String sessionBeanId = firstRequestResult.getContent(); - assertNotNull(sessionBeanId); - // Make a second request and make sure the same context is used - TextPage secondRequestResult = webClient.getPage(contextPath - + "introspect"); - assertNotNull(secondRequestResult.getContent()); - assertEquals(secondRequestResult.getContent(), sessionBeanId); - } - - /** - * Test that the session context is destroyed at the very end of any request - * in which invalidate() was called, after all filters and - * ServletRequestListeners have been called. - * - * @throws Exception - */ - @Test(groups = INTEGRATION) - @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ca") - public void testSessionContextDestroyedWhenHttpSessionInvalidated() - throws Exception { - WebClient webClient = new WebClient(); - - TextPage firstRequestResult = webClient.getPage(contextPath - + "introspect"); - assertNotNull(firstRequestResult.getContent()); - String sessionBeanId = firstRequestResult.getContent(); - // Invalidate the session - webClient.getPage(contextPath + "introspect?mode=invalidate"); - // Make a second request and make sure the same context is not there - TextPage secondRequestResult = webClient.getPage(contextPath - + "introspect"); - assertNotNull(secondRequestResult.getContent()); - assertNotEquals(secondRequestResult.getContent(), sessionBeanId); - - // Verify context is destroyed after all filters and - // ServletRequestListeners - TextPage verifyResult = webClient.getPage(contextPath - + "introspect?mode=verify"); - ActionSequence correctSequence = new ActionSequence() - .add(IntrospectServlet.class.getName()) - .add(IntrospectHttpSessionListener.class.getName()) - .add(IntrospectFilter.class.getName()) - .add(IntrospectServletRequestListener.class.getName()) - .add(SimpleSessionBean.class.getName()); - assertEquals(verifyResult.getContent(), correctSequence.toString()); - } - - /** - * The session context is destroyed when the HTTPSession times out, after - * all HttpSessionListeners have been called. - * - * @throws Exception - */ - @Test(groups = INTEGRATION) - @SpecAssertion(section = SESSION_CONTEXT_EE, id = "cb") - public void testSessionContextDestroyedWhenHttpSessionTimesOut() - throws Exception { - WebClient webClient = new WebClient(); - TextPage firstRequestResult = webClient.getPage(contextPath - + "introspect"); - assertNotNull(firstRequestResult.getContent()); - String sessionBeanId = firstRequestResult.getContent(); - assertNotNull(sessionBeanId); - - webClient.getPage(contextPath + "introspect?mode=timeout"); - Timer.startNew(DEFAULT_SLEEP_INTERVAL); - - // Make a second request and make sure the same context is not there - TextPage secondRequestResult = webClient.getPage(contextPath - + "introspect"); - assertNotNull(secondRequestResult.getContent()); - assertNotEquals(secondRequestResult.getContent(), sessionBeanId); - - // Verify context is destroyed after all filters and - // ServletRequestListeners - TextPage verifyResult = webClient.getPage(contextPath - + "introspect?mode=verify"); - ActionSequence correctSequence = new ActionSequence() - .add(IntrospectHttpSessionListener.class.getName()) - .add(SimpleSessionBean.class.getName()); - assertEquals(verifyResult.getContent(), correctSequence.toString()); - } + private static final long DEFAULT_SLEEP_INTERVAL = 3000; + + @ArquillianResource + private URL contextPath; + + @Deployment(testable = false) + public static WebArchive createTestArchive() { + return new WebArchiveBuilder() + .withTestClassPackage(SessionContextTest.class) + .withWebResource("SimplePage.html", "SimplePage.html").build(); + } + + @Test(groups = INTEGRATION) + @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "aa"), + @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ae") }) + public void testSessionScopeActiveDuringServiceMethod() throws Exception { + WebClient webClient = new WebClient(); + webClient.getPage(contextPath + "test"); + } + + @Test(groups = INTEGRATION) + @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ab"), + @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ae") }) + public void testSessionScopeActiveDuringDoFilterMethod() throws Exception { + WebClient webClient = new WebClient(); + webClient.getPage(contextPath + "SimplePage.html"); + } + + @Test(groups = INTEGRATION) + @SpecAssertion(section = SESSION_CONTEXT_EE, id = "b") + public void testSessionContextSharedBetweenServletRequestsInSameHttpSession() + throws Exception { + WebClient webClient = new WebClient(); + TextPage firstRequestResult = webClient.getPage(contextPath + + "introspect"); + assertNotNull(firstRequestResult.getContent()); + String sessionBeanId = firstRequestResult.getContent(); + assertNotNull(sessionBeanId); + // Make a second request and make sure the same context is used + TextPage secondRequestResult = webClient.getPage(contextPath + + "introspect"); + assertNotNull(secondRequestResult.getContent()); + assertEquals(secondRequestResult.getContent(), sessionBeanId); + } + + /** + * Test that the session context is destroyed at the very end of any request + * in which invalidate() was called, after all filters and + * ServletRequestListeners have been called. + * + * @throws Exception + */ + @Test(groups = INTEGRATION) + @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ca") + public void testSessionContextDestroyedWhenHttpSessionInvalidated() + throws Exception { + WebClient webClient = new WebClient(); + + TextPage firstRequestResult = webClient.getPage(contextPath + + "introspect"); + assertNotNull(firstRequestResult.getContent()); + String sessionBeanId = firstRequestResult.getContent(); + // Invalidate the session + webClient.getPage(contextPath + "introspect?mode=invalidate"); + // Make a second request and make sure the same context is not there + TextPage secondRequestResult = webClient.getPage(contextPath + + "introspect"); + assertNotNull(secondRequestResult.getContent()); + assertNotEquals(secondRequestResult.getContent(), sessionBeanId); + + // Verify context is destroyed after all filters and + // ServletRequestListeners + TextPage verifyResult = webClient.getPage(contextPath + + "introspect?mode=verify"); + ActionSequence correctSequence = new ActionSequence() + .add(IntrospectServlet.class.getName()) + .add(IntrospectHttpSessionListener.class.getName()) + .add(IntrospectFilter.class.getName()) + .add(IntrospectServletRequestListener.class.getName()) + .add(SimpleSessionBean.class.getName()); + assertEquals(verifyResult.getContent(), correctSequence.toString()); + } + + /** + * The session context is destroyed when the HTTPSession times out, after + * all HttpSessionListeners have been called. + * + * @throws Exception + */ + @Test(groups = INTEGRATION) + @SpecAssertion(section = SESSION_CONTEXT_EE, id = "cb") + public void testSessionContextDestroyedWhenHttpSessionTimesOut() + throws Exception { + WebClient webClient = new WebClient(); + TextPage firstRequestResult = webClient.getPage(contextPath + + "introspect"); + assertNotNull(firstRequestResult.getContent()); + String sessionBeanId = firstRequestResult.getContent(); + assertNotNull(sessionBeanId); + + webClient.getPage(contextPath + "introspect?mode=timeout"); + Timer.startNew(DEFAULT_SLEEP_INTERVAL); + + // Make a second request and make sure the same context is not there + TextPage secondRequestResult = webClient.getPage(contextPath + + "introspect"); + assertNotNull(secondRequestResult.getContent()); + assertNotEquals(secondRequestResult.getContent(), sessionBeanId); + + // Verify context is destroyed after all filters and + // ServletRequestListeners + TextPage verifyResult = webClient.getPage(contextPath + + "introspect?mode=verify"); + ActionSequence correctSequence = new ActionSequence() + .add(IntrospectHttpSessionListener.class.getName()) + .add(SimpleSessionBean.class.getName()); + assertEquals(verifyResult.getContent(), correctSequence.toString()); + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SimpleSessionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SimpleSessionBean.java index bbe5f0a6f3..c2a9432ac7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SimpleSessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/SimpleSessionBean.java @@ -29,12 +29,12 @@ public class SimpleSessionBean implements Serializable { private String id = UUID.randomUUID().toString(); public String getId() { - return id; - } + return id; + } - @PreDestroy + @PreDestroy public void destroy() { - ActionSequence.addAction(SimpleSessionBean.class.getName()); + ActionSequence.addAction(SimpleSessionBean.class.getName()); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestFilter.java index 440626c5a0..7493550983 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestFilter.java @@ -31,39 +31,39 @@ @WebFilter(filterName = "FilterTest", displayName = "Test Filter for Sessions", urlPatterns = "/SimplePage.html") public class TestFilter implements Filter { - private static final SimpleLogger logger = new SimpleLogger( - TestFilter.class); + private static final SimpleLogger logger = new SimpleLogger( + TestFilter.class); - @Inject - private BeanManager beanManager; + @Inject + private BeanManager beanManager; - @Inject - private SimpleSessionBean simpleBean; + @Inject + private SimpleSessionBean simpleBean; - public void destroy() { - beanManager = null; - } + public void destroy() { + beanManager = null; + } - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - logger.log("Do filter..."); - checkSessionContextActive(); - chain.doFilter(request, response); - checkSessionContextActive(); + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + logger.log("Do filter..."); + checkSessionContextActive(); + chain.doFilter(request, response); + checkSessionContextActive(); - } + } - public void init(FilterConfig filterConfig) throws ServletException { - } + public void init(FilterConfig filterConfig) throws ServletException { + } - private void checkSessionContextActive() throws ServletException { - if (beanManager == null - || !beanManager.getContext(SessionScoped.class).isActive() - || simpleBean == null) { - throw new ServletException("Session context is not active"); - } - // Check bean invocation - simpleBean.getId(); - } + private void checkSessionContextActive() throws ServletException { + if (beanManager == null + || !beanManager.getContext(SessionScoped.class).isActive() + || simpleBean == null) { + throw new ServletException("Session context is not active"); + } + // Check bean invocation + simpleBean.getId(); + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestServlet.java index 704d1bdd17..03c8bddb26 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/TestServlet.java @@ -34,36 +34,36 @@ @WebServlet(name = "TestServlet", urlPatterns = "/test") public class TestServlet extends HttpServlet { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @Inject - private BeanManager beanManager; + @Inject + private BeanManager beanManager; - @Inject - private SimpleSessionBean simpleBean; + @Inject + private SimpleSessionBean simpleBean; - @Override - protected void service(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - checkSessionContextActive(); - super.service(req, resp); - } + @Override + protected void service(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + checkSessionContextActive(); + super.service(req, resp); + } - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException { - resp.setContentType("text/text"); - resp.getWriter().println("It worked!"); - } + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + resp.setContentType("text/text"); + resp.getWriter().println("It worked!"); + } - private void checkSessionContextActive() throws ServletException { - if (beanManager == null - || !beanManager.getContext(SessionScoped.class).isActive() - || simpleBean == null) { - throw new ServletException("Session context is not active"); - } - // Check bean invocation - simpleBean.getId(); - } + private void checkSessionContextActive() throws ServletException { + if (beanManager == null + || !beanManager.getContext(SessionScoped.class).isActive() + || simpleBean == null) { + throw new ServletException("Session context is not active"); + } + // Check bean invocation + simpleBean.getId(); + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/SessionContextAsyncListenerTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/SessionContextAsyncListenerTest.java index 871c126deb..02a0a26b7e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/SessionContextAsyncListenerTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/SessionContextAsyncListenerTest.java @@ -53,7 +53,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(SessionContextAsyncListenerTest.class).build(); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ad") }) public void testSessionContextActiveOnComplete() throws Exception { WebClient webClient = new WebClient(); @@ -66,7 +66,7 @@ public void testSessionContextActiveOnComplete() throws Exception { assertFalse(id.isEmpty()); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ad") }) public void testSessionContextActiveOnTimeout() throws Exception { WebClient webClient = new WebClient(); @@ -75,7 +75,7 @@ public void testSessionContextActiveOnTimeout() throws Exception { assertTrue(results.getContent().contains("onTimeout: true")); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ad") }) public void testSessionContextActiveOnError() throws Exception { WebClient webClient = new WebClient(); @@ -85,7 +85,7 @@ public void testSessionContextActiveOnError() throws Exception { assertTrue(results.getContent().contains("onError: true")); } - @Test(groups = {INTEGRATION, ASYNC_SERVLET}) + @Test(groups = { INTEGRATION, ASYNC_SERVLET }) @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ad") }) public void testSessionContextActiveOnStartAsync() throws Exception { WebClient webClient = new WebClient(); @@ -102,7 +102,7 @@ private String getPath(String test) { private String extractSimpleSessionBeanId(String content) { // See SimpleAsyncListener#getInfo() Matcher matcher = Pattern.compile("^(.+)(simpleSessionBeanId: )(.+)$").matcher(content); - if(matcher.matches()) { + if (matcher.matches()) { return matcher.group(3); } return null; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusBean.java index 295af00929..2b44762763 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusBean.java @@ -64,7 +64,7 @@ public void setOnTimeout(boolean onTimeout) { this.onTimeout = onTimeout; } - public void reset(){ + public void reset() { this.onComplete = false; this.onStartAsync = false; this.onTimeout = false; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusServlet.java index 8db0983092..f3f214c986 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/async/StatusServlet.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.context.session.async; import java.io.IOException; + import jakarta.inject.Inject; import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebServlet; @@ -40,6 +41,7 @@ private void writeInfo(ServletResponse response) throws IOException { public String getInfo() { return String .format("onStartAsync: %s, onError: %s, onTimeout: %s, onComplete: %s, simpleSessionBeanId: %s", - statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), statusBean.isOnComplete(), statusBean.getSessionBeanId()); + statusBean.isOnStartAsync(), statusBean.isOnError(), statusBean.isOnTimeout(), + statusBean.isOnComplete(), statusBean.getSessionBeanId()); } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/Servlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/Servlet.java index c92f8a4555..c45ba85387 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/Servlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/Servlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -39,7 +39,8 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se int destroyed = observer.getDestroyedSessionCount().get(); req.getSession().invalidate(); if (destroyed != observer.getDestroyedSessionCount().get()) { - throw new RuntimeException("@Destroyed(SessionScoped.class) called before the session context was actually destroyed"); + throw new RuntimeException( + "@Destroyed(SessionScoped.class) called before the session context was actually destroyed"); } } resp.getWriter().append("Initialized sessions:" + observer.getInitializedSessionCount().get()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopeEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopeEventTest.java index cea36049e3..258eb67913 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopeEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopeEventTest.java @@ -53,7 +53,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "da"), @SpecAssertion(section = SESSION_CONTEXT_EE, id = "db"), + @SpecAssertions({ @SpecAssertion(section = SESSION_CONTEXT_EE, id = "da"), + @SpecAssertion(section = SESSION_CONTEXT_EE, id = "db"), @SpecAssertion(section = SESSION_CONTEXT_EE, id = "dc"), @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ca") }) public void test() throws Exception { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopedBean.java index 69d0996a86..96ca9e7240 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/event/SessionScopedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SessionContextServletRequestListenerTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SessionContextServletRequestListenerTest.java index bda86cd5d3..774465e00e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SessionContextServletRequestListenerTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SessionContextServletRequestListenerTest.java @@ -34,28 +34,28 @@ @SpecVersion(spec = "cdi", version = "2.0") public class SessionContextServletRequestListenerTest extends AbstractTest { - @ArquillianResource - private URL contextPath; - - @Deployment(testable = false) - public static WebArchive createTestArchive() { - return new WebArchiveBuilder() - .withTestClassDefinition(SessionContextServletRequestListenerTest.class) - .withClasses(SimpleSessionBean.class, IntrospectServlet.class, TestServletRequestListener.class) - .build(); - } - - @Test(groups = INTEGRATION) - @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ae") - public void testSessionScopeActiveDuringServletRequestListenerCall() throws Exception { - WebClient webClient = new WebClient(); - // Create session - webClient.getPage(contextPath + "introspect"); - // Invalidate session - webClient.getPage(contextPath + "introspect?mode=invalidate"); - // Verify result - TextPage page = webClient.getPage(contextPath + "introspect?mode=verify"); - assertTrue(Boolean.valueOf(page.getContent())); - } + @ArquillianResource + private URL contextPath; + + @Deployment(testable = false) + public static WebArchive createTestArchive() { + return new WebArchiveBuilder() + .withTestClassDefinition(SessionContextServletRequestListenerTest.class) + .withClasses(SimpleSessionBean.class, IntrospectServlet.class, TestServletRequestListener.class) + .build(); + } + + @Test(groups = INTEGRATION) + @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ae") + public void testSessionScopeActiveDuringServletRequestListenerCall() throws Exception { + WebClient webClient = new WebClient(); + // Create session + webClient.getPage(contextPath + "introspect"); + // Invalidate session + webClient.getPage(contextPath + "introspect?mode=invalidate"); + // Verify result + TextPage page = webClient.getPage(contextPath + "introspect?mode=verify"); + assertTrue(Boolean.valueOf(page.getContent())); + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SimpleSessionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SimpleSessionBean.java index 33b39c1a41..b7255d8b40 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SimpleSessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/SimpleSessionBean.java @@ -27,10 +27,10 @@ public class SimpleSessionBean implements Serializable { private String id = UUID.randomUUID().toString(); public String getId() { - return id; - } + return id; + } - @PreDestroy + @PreDestroy public void destroy() { beanDestroyed = true; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestHttpSessionListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestHttpSessionListener.java index 6e1f0cc227..390bbf7d1b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestHttpSessionListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestHttpSessionListener.java @@ -25,38 +25,38 @@ @WebListener public class TestHttpSessionListener implements HttpSessionListener { - private static final SimpleLogger logger = new SimpleLogger( - TestHttpSessionListener.class); - - @Inject - private BeanManager beanManager; - - @Inject - private SimpleSessionBean simpleBean; - - @Override - public void sessionCreated(HttpSessionEvent se) { - logger.log("Session {0} created...", se.getSession().getId()); - checkSessionContextActive(); - } - - @Override - public void sessionDestroyed(HttpSessionEvent se) { - logger.log("Session {0} destroyed...", se.getSession().getId()); - checkSessionContextActive(); - } - - private void checkSessionContextActive() throws IllegalStateException { - try { - if (!beanManager.getContext(SessionScoped.class).isActive() - || simpleBean == null) { - IntrospectServlet.isSessionScopeActive = false; - } - // Check bean invocation - logger.log("Simple bean id: {0}", simpleBean.getId()); - } catch (Exception e) { - IntrospectServlet.isSessionScopeActive = false; - } - } + private static final SimpleLogger logger = new SimpleLogger( + TestHttpSessionListener.class); + + @Inject + private BeanManager beanManager; + + @Inject + private SimpleSessionBean simpleBean; + + @Override + public void sessionCreated(HttpSessionEvent se) { + logger.log("Session {0} created...", se.getSession().getId()); + checkSessionContextActive(); + } + + @Override + public void sessionDestroyed(HttpSessionEvent se) { + logger.log("Session {0} destroyed...", se.getSession().getId()); + checkSessionContextActive(); + } + + private void checkSessionContextActive() throws IllegalStateException { + try { + if (!beanManager.getContext(SessionScoped.class).isActive() + || simpleBean == null) { + IntrospectServlet.isSessionScopeActive = false; + } + // Check bean invocation + logger.log("Simple bean id: {0}", simpleBean.getId()); + } catch (Exception e) { + IntrospectServlet.isSessionScopeActive = false; + } + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestServletRequestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestServletRequestListener.java index 4b185b2a82..f6a88e76c0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestServletRequestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/TestServletRequestListener.java @@ -45,21 +45,21 @@ public void requestDestroyed(ServletRequestEvent sre) { @Override public void requestInitialized(ServletRequestEvent sre) { - logger.log("Request initialized..."); - checkSessionContextActive(); + logger.log("Request initialized..."); + checkSessionContextActive(); } private void checkSessionContextActive() throws IllegalStateException { - try { - if (!beanManager.getContext(SessionScoped.class).isActive() - || simpleBean == null) { - IntrospectServlet.isSessionScopeActive = false; - } - // Check bean invocation - simpleBean.getId(); - } catch (Exception e) { - IntrospectServlet.isSessionScopeActive = false; - } - } + try { + if (!beanManager.getContext(SessionScoped.class).isActive() + || simpleBean == null) { + IntrospectServlet.isSessionScopeActive = false; + } + // Check bean invocation + simpleBean.getId(); + } catch (Exception e) { + IntrospectServlet.isSessionScopeActive = false; + } + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/shutdown/SessionContextListenerShutdownTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/shutdown/SessionContextListenerShutdownTest.java index b7f9e8e98f..020f3cf6cd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/shutdown/SessionContextListenerShutdownTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/context/session/listener/shutdown/SessionContextListenerShutdownTest.java @@ -93,7 +93,8 @@ public void deployArchives() { */ @Test(groups = INTEGRATION, dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertion(section = SESSION_CONTEXT_EE, id = "ac") - public void testApplicationContextDestroyed(@ArquillianResource @OperateOnDeployment(ALPHA_DEPLOYMENT_NAME) URL alphaContext, + public void testApplicationContextDestroyed( + @ArquillianResource @OperateOnDeployment(ALPHA_DEPLOYMENT_NAME) URL alphaContext, @ArquillianResource @OperateOnDeployment(BRAVO_ARCHIVE_NAME) URL bravoContext) throws Exception { // Init SessionScopedTestFlagClient - set bravo archive deployment url diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java index 807b519186..61f016fc52 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/request/BuiltinHttpServletRequestDecoratorTest.java @@ -20,10 +20,18 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; + import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -34,16 +42,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; - /** * @author Martin Kouba - * + * */ @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") @@ -55,7 +56,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinHttpServletRequestDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(HttpServletRequestDecorator1.class, HttpServletRequestDecorator2.class)).build(); + new BeansXml().decorators(HttpServletRequestDecorator1.class, HttpServletRequestDecorator2.class)) + .build(); } @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java index 1360923b0c..96fdab60b9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/servletcontext/BuiltinServletContextDecoratorTest.java @@ -19,9 +19,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; + import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; import jakarta.servlet.ServletContext; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -32,13 +37,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; - /** * @author Martin Kouba - * + * */ @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") @@ -50,7 +51,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinServletContextDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(ServletContextDecorator1.class, ServletContextDecorator2.class)).build(); + new BeansXml().decorators(ServletContextDecorator1.class, ServletContextDecorator2.class)) + .build(); } @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java index 1dc3ba63d3..47808b4b8c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/BuiltinHttpSessionDecoratorTest.java @@ -20,9 +20,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; + import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; import jakarta.servlet.http.HttpSession; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -33,10 +38,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; - /** * @author Martin Kouba * @@ -50,7 +51,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinHttpSessionDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(HttpSessionDecorator1.class, HttpSessionDecorator2.class)).build(); + new BeansXml().decorators(HttpSessionDecorator1.class, HttpSessionDecorator2.class)) + .build(); } @Inject @@ -60,7 +62,8 @@ public static WebArchive createTestArchive() { HttpSessionObserver httpSessionObserver; @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = DECORATOR_BEAN_EE, id = "acj"), @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = DECORATOR_BEAN_EE, id = "acj"), + @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa") }) public void testDecoratorIsResolved() { List> decorators = getCurrentManager().resolveDecorators(Collections. singleton(HttpSession.class)); assertEquals(2, decorators.size()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator1.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator1.java index fdb6bc8b09..13ef65bb33 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator1.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator1.java @@ -23,7 +23,7 @@ /** * @author Martin Kouba - * + * */ @Decorator public abstract class HttpSessionDecorator1 implements HttpSession, Serializable { @@ -46,6 +46,4 @@ public void invalidate() { httpSessionObserver.setDecorated(true); } - - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator2.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator2.java index 6ff0893078..ec1ba08978 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator2.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/HttpSessionDecorator2.java @@ -23,7 +23,7 @@ /** * @author Jozef Hartinger - * + * */ @Decorator @SuppressWarnings("serial") @@ -46,6 +46,4 @@ public Object getAttribute(String name) { return delegate.getAttribute(name); } - - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/SessionListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/SessionListener.java index 55bb63accc..ac513c8413 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/SessionListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/http/session/SessionListener.java @@ -21,7 +21,7 @@ /** * @author Martin Kouba - * + * */ @WebListener public class SessionListener implements HttpSessionListener { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java index b10bb53c13..b20e685063 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/principal/BuiltinPrincipalDecoratorTest.java @@ -18,7 +18,12 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import java.lang.reflect.Type; +import java.security.Principal; +import java.util.Collections; + import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.tests.full.decorators.AbstractDecoratorTest; @@ -29,12 +34,8 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.security.Principal; -import java.util.Collections; - /** - * + * * @author Martin Kouba */ @Test(groups = JAVAEE_FULL) @@ -47,7 +48,8 @@ public static EnterpriseArchive createTestArchive() { .withTestClassPackage(BuiltinPrincipalDecoratorTest.class) .withClass(AbstractDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(PrincipalDecorator.class)).build(); + new BeansXml().decorators(PrincipalDecorator.class)) + .build(); } @Inject diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java index d65bdef5c5..3faabb1c7a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/builtin/transaction/BuiltinUserTransactionDecoratorTest.java @@ -18,6 +18,7 @@ import jakarta.inject.Inject; import jakarta.transaction.Status; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; @@ -30,7 +31,7 @@ import org.testng.annotations.Test; /** - * + * * @author Jozef Hartinger * */ @@ -46,7 +47,8 @@ public static EnterpriseArchive createTestArchive() { return new EnterpriseArchiveBuilder() .withTestClassPackage(BuiltinUserTransactionDecoratorTest.class) .withBeansXml( - new BeansXml().decorators(UserTransactionDecorator.class)).build(); + new BeansXml().decorators(UserTransactionDecorator.class)) + .build(); } @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankAccount.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankAccount.java index 15a4e5ecd2..0e089d726f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankAccount.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ public interface BankAccount { public void withdraw(int amount); public void deposit(int amount); - + public int getBalance(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankServlet.java index 3420d00be6..52f4954007 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/BankServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ChargeDecorator.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ChargeDecorator.java index 2837b5e7f8..488b7069c9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ChargeDecorator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ChargeDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -26,7 +26,7 @@ /** * Decorator is a managed bean and may use the {@link PostConstruct} and {@link PreDestroy} annotations to identify methods to * be called back by the container at the appropriate points in the bean’s lifecycle. - * + * * @author Martin Kouba */ @SuppressWarnings("serial") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java index 52f289edeb..4f995058cd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DecoratorInstanceIsDependentObjectTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,8 +17,8 @@ import static org.jboss.cdi.tck.cdi.Sections.DECORATORS; import static org.testng.Assert.assertTrue; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; +import java.net.URL; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; @@ -30,10 +30,11 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.net.URL; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; /** - * + * * @author Martin Kouba */ @Test(groups = INTEGRATION) @@ -48,7 +49,8 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(DecoratorInstanceIsDependentObjectTest.class) .withBeansXml( - new BeansXml().decorators(ChargeDecorator.class)).build(); + new BeansXml().decorators(ChargeDecorator.class)) + .build(); } @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DurableAccount.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DurableAccount.java index 7d41f34d45..1d0cd9cdf2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DurableAccount.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/DurableAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ShortTermAccount.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ShortTermAccount.java index 1ef3aa8702..4f351fd6ed 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ShortTermAccount.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/definition/lifecycle/ShortTermAccount.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/EJBDecoratorInvocationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/EJBDecoratorInvocationTest.java index a9e71e8a6f..b015bd296e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/EJBDecoratorInvocationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/EJBDecoratorInvocationTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -19,6 +19,7 @@ import static org.testng.Assert.assertTrue; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -50,7 +51,8 @@ public static WebArchive createTestArchive() { PigSty pigSty; @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = BIZ_METHOD_EE, id = "d"), @SpecAssertion(section = DECORATOR_BEAN_EE, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = BIZ_METHOD_EE, id = "d"), + @SpecAssertion(section = DECORATOR_BEAN_EE, id = "ab") }) public void testEJBDecoratorInvocation() { PigStyDecorator.reset(); PigStyImpl.reset(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/Pig.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/Pig.java index ce52f22cc8..8ec247ad9f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/Pig.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/Pig.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.decorators.invocation.ejb; -import jakarta.enterprise.context.Dependent; - import java.io.Serializable; +import jakarta.enterprise.context.Dependent; + @Dependent public class Pig implements Serializable { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigSty.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigSty.java index 4b348ab9c6..5aa5ec3e4c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigSty.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigSty.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Local public interface PigSty { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyDecorator.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyDecorator.java index 06bc36ef1d..8dcadbfd2e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyDecorator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyImpl.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyImpl.java index 1313c0b806..066795dca0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyImpl.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/ejb/PigStyImpl.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Stateful public class PigStyImpl implements PigSty { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/Bar.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/Bar.java index 203dfb9dbc..b6ec41353c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/Bar.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @Stateless public class Bar extends BusinessBase implements BarBusiness { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/BusinessBase.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/BusinessBase.java index 451435a7de..ef39a01605 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/BusinessBase.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/BusinessBase.java @@ -16,7 +16,7 @@ /** * @author Martin Kouba - * + * */ public abstract class BusinessBase implements Business { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java index da0abbfc99..743a497fef 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/EnterpriseDecoratorInvocationTest.java @@ -21,8 +21,13 @@ import static org.jboss.cdi.tck.cdi.Sections.DELEGATE_ATTRIBUTE; import static org.testng.Assert.assertEquals; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.List; + import jakarta.enterprise.inject.spi.Decorator; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -34,10 +39,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.List; - /** * * @author Martin Kouba diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooBinding.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooBinding.java index 937da2b43a..6fe9be54e3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooInterceptor.java index c708e5bb16..70841ac441 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/invocation/enterprise/FooInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/DecoratedImpl.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/DecoratedImpl.java index b7bf35ba10..1eabc5cf13 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/DecoratedImpl.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/DecoratedImpl.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.tests.decorators.ordering.global; -import jakarta.enterprise.context.Dependent; - import java.util.List; +import jakarta.enterprise.context.Dependent; + @Dependent public class DecoratedImpl implements Decorated { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java index 980883e9f0..f0e15de7b0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/EnterpriseDecoratorOrderingTest.java @@ -32,7 +32,6 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; @@ -45,7 +44,7 @@ * @author Matus Abaffy */ @SpecVersion(spec = "cdi", version = "2.0") - public class EnterpriseDecoratorOrderingTest extends AbstractTest { +public class EnterpriseDecoratorOrderingTest extends AbstractTest { /** * Modules: @@ -82,7 +81,8 @@ public static EnterpriseArchive createTestArchive() { //D JavaArchive ejbArchive = ShrinkWrap .create(JavaArchive.class, ejbJar) - .addClasses(DummyDao.class, GloballyEnabledDecorator2.class, GloballyEnabledDecorator5.class, LegacyDecorator3.class) + .addClasses(DummyDao.class, GloballyEnabledDecorator2.class, GloballyEnabledDecorator5.class, + LegacyDecorator3.class) .addAsManifestResource(new BeansXml().decorators(LegacyDecorator3.class), "beans.xml") .setManifest( new StringAsset(Descriptors.create(ManifestDescriptor.class) @@ -114,8 +114,8 @@ public static EnterpriseArchive createTestArchive() { @Test(groups = JAVAEE_FULL) @SpecAssertions({ @SpecAssertion(section = DECORATORS_EE, id = "b"), - @SpecAssertion(section = DECORATORS_EE, id = "c"), - @SpecAssertion(section = DECORATORS_EE, id = "d")}) + @SpecAssertion(section = DECORATORS_EE, id = "c"), + @SpecAssertion(section = DECORATORS_EE, id = "d") }) public void testDecoratorsInWebInfClasses() { List expected = new ArrayList(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java index c53dedffbf..50b6f34f59 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/decorators/ordering/global/GlobalDecoratorOrderingTest.java @@ -18,7 +18,11 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_DECORATORS_PRIORITY; import static org.testng.Assert.assertEquals; +import java.util.ArrayList; +import java.util.List; + import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -29,9 +33,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.List; - /** *

    * This test was originally part of the Weld test suite. @@ -53,7 +54,8 @@ public static WebArchive createTestArchive() { .withBeansXml(new BeansXml().decorators(LegacyDecorator1.class, LegacyDecorator2.class, LegacyDecorator3.class)) .withBeanLibrary(AbstractDecorator.class, Decorated.class, GloballyEnabledDecorator1.class, GloballyEnabledDecorator2.class, GloballyEnabledDecorator3.class, GloballyEnabledDecorator4.class, - GloballyEnabledDecorator5.class).build(); + GloballyEnabledDecorator5.class) + .build(); } @Inject @@ -63,7 +65,7 @@ public static WebArchive createTestArchive() { @SpecAssertions({ @SpecAssertion(section = ENABLED_DECORATORS_PRIORITY, id = "a"), @SpecAssertion(section = ENABLED_DECORATORS_BEAN_ARCHIVE, id = "a"), @SpecAssertion(section = ENABLED_DECORATORS_PRIORITY, id = "b"), - @SpecAssertion(section = ENABLED_DECORATORS, id = "c")}) + @SpecAssertion(section = ENABLED_DECORATORS, id = "c") }) public void testDecoratorsInWebInfClasses() { List expected = new ArrayList(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RestrictedSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RestrictedSessionBeanTest.java index b9c5c8a4af..935fba734d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RestrictedSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RestrictedSessionBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RockBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RockBean.java index 512f2b61cc..b2d5b86eb4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RockBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/broken/restricted/ejb/RockBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,10 +15,11 @@ import jakarta.ejb.Stateless; import jakarta.enterprise.inject.Typed; + import org.jboss.cdi.tck.tests.definition.bean.broken.restricted.Animal; /** - * + * * @author Martin Kouba */ @Typed(value = Animal.class) 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 619ff34152..c431cfcb9b 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2015, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.bean.types.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Mock { - class Literal extends AnnotationLiteral implements Mock { - } -} +/* + * Copyright 2015, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.bean.types.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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 9c1fd1763c..56e7581eb0 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 @@ -21,7 +21,6 @@ import static org.testng.Assert.assertNotNull; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.TypeLiteral; import org.jboss.arquillian.container.test.api.Deployment; @@ -102,10 +101,10 @@ public void testSessionBeanExtendingSessionBeanWithLocalClientView() { assertEquals(loginBean.getTypes().size(), 3); assertTypeSetMatches(loginBean.getTypes(), Object.class, LoginActionBean.class, MockLoginActionBean.class); } - + @Test(groups = INTEGRATION) @SpecAssertion(section = SESSION_BEAN_TYPES, id = "ba") - public void testSessionBeanWithNoInterfaceView(){ + public void testSessionBeanWithNoInterfaceView() { Bean cobraBean = getUniqueBean(Cobra.class); assertNotNull(cobraBean); assertEquals(cobraBean.getTypes().size(), 3); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/Bird.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/Bird.java index 9e1effdc02..0e498400f0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/Bird.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/Bird.java @@ -14,6 +14,6 @@ package org.jboss.cdi.tck.tests.definition.bean.types.enterprise.illegal; -public interface Bird extends AnimalHolder>{ +public interface Bird extends AnimalHolder> { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollie.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollie.java index ded869136d..fba80e01b9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollie.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; - -import jakarta.ejb.Stateless; - -@Stateless -public class BorderCollie extends LongHairedDog implements BorderCollieLocal { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; + +import jakarta.ejb.Stateless; + +@Stateless +public class BorderCollie extends LongHairedDog implements BorderCollieLocal { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollieLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollieLocal.java index 46a76aa775..48c92cd6f1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollieLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/BorderCollieLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface BorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface BorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollie.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollie.java index a4b4dbb442..4ccdbcbd45 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollie.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; - -import jakarta.ejb.Stateless; - -@Stateless -public class EnglishBorderCollie extends BorderCollie implements EnglishBorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; + +import jakarta.ejb.Stateless; + +@Stateless +public class EnglishBorderCollie extends BorderCollie implements EnglishBorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollieLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollieLocal.java index 4864756de4..6332584b32 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollieLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnglishBorderCollieLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface EnglishBorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface EnglishBorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java index 69f181ae02..c40338fc6e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/EnterpriseQualifierDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCat.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCat.java index b2cd2b0c1a..7fdb0388a9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCat.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCatLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCatLocal.java index 3efcc53036..34b83ee01b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCatLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/FamousCatLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairless.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairless.java index eee8db9caf..2f17e8c6fb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairless.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairless.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessCat.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessCat.java index 9e4647d4fe..932ba506da 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessCat.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessCat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java index 9307a81675..3d6daea7b2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairy.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairy.java index e0ffa2cf8e..5d44346d4a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairy.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Hairy.java @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -@Inherited -public @interface Hairy { - public boolean clipped(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +@Inherited +public @interface Hairy { + public boolean clipped(); +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairyQualifier.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairyQualifier.java index 707d5699fe..f48ac9545d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairyQualifier.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/HairyQualifier.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; - -import jakarta.enterprise.util.AnnotationLiteral; - -public class HairyQualifier extends AnnotationLiteral implements Hairy { - private boolean clipped; - - public HairyQualifier(boolean clipped) { - this.clipped = clipped; - } - - public boolean clipped() { - return clipped; - } - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; + +import jakarta.enterprise.util.AnnotationLiteral; + +public class HairyQualifier extends AnnotationLiteral implements Hairy { + private boolean clipped; + + public HairyQualifier(boolean clipped) { + this.clipped = clipped; + } + + public boolean clipped() { + return clipped; + } + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/LongHairedDog.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/LongHairedDog.java index 6b3f2e7eb4..bd9113a2c6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/LongHairedDog.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/LongHairedDog.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; - -@Hairy(clipped = false) -public class LongHairedDog { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.qualifier.enterprise; + +@Hairy(clipped = false) +public class LongHairedDog { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Skinny.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Skinny.java index 0b5b434b1f..ece92322ea 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Skinny.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/Skinny.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java index 92a76d7d2e..7863f4bb8d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCatLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCatLocal.java index adc529c5d7..5fef9c51e5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCatLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyHairlessCatLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java index 0f0b595710..b9ebe9a6e7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCat.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCat.java index cae4e32c38..8fd901112c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCat.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCatLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCatLocal.java index 964540883a..33ee314885 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCatLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/qualifier/enterprise/TameSkinnyHairlessCatLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanTooManyScopesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanTooManyScopesTest.java index b01c5700eb..4d858c2974 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanTooManyScopesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanTooManyScopesTest.java @@ -6,14 +6,18 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.DECLARING_BEAN_SCOPE; + import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -23,16 +27,14 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.DECLARING_BEAN_SCOPE; - @SpecVersion(spec = "cdi", version = "2.0") public class SessionBeanTooManyScopesTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(SessionBeanTooManyScopesTest.class).withClass(SessionBeanWithTooManyScopeTypes_Broken.class).build(); + return new WebArchiveBuilder().withTestClass(SessionBeanTooManyScopesTest.class) + .withClass(SessionBeanWithTooManyScopeTypes_Broken.class).build(); } @Test(groups = INTEGRATION) @@ -40,4 +42,4 @@ public static WebArchive createTestArchive() { public void testTooManyScopesSpecifiedInJava() { } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanWithTooManyScopeTypes_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanWithTooManyScopeTypes_Broken.java index 2ff40542ce..ed5db209a9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanWithTooManyScopeTypes_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/SessionBeanWithTooManyScopeTypes_Broken.java @@ -1,24 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb; - -import jakarta.ejb.Singleton; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.Dependent; - -@ApplicationScoped -@Dependent -@Singleton -public class SessionBeanWithTooManyScopeTypes_Broken { +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb; + +import jakarta.ejb.Singleton; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; + +@ApplicationScoped +@Dependent +@Singleton +public class SessionBeanWithTooManyScopeTypes_Broken { } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldTooManyScopesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldTooManyScopesTest.java index d4b5b86592..14995d4623 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldTooManyScopesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldTooManyScopesTest.java @@ -6,14 +6,18 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.field; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.DECLARING_BEAN_SCOPE; + import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -23,16 +27,14 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.DECLARING_BEAN_SCOPE; - @SpecVersion(spec = "cdi", version = "2.0") public class SessionBeanProducerFieldTooManyScopesTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(SessionBeanProducerFieldTooManyScopesTest.class).withClass(SessionBeanProducerFieldWithTooManyScopeTypes_Broken.class).build(); + return new WebArchiveBuilder().withTestClass(SessionBeanProducerFieldTooManyScopesTest.class) + .withClass(SessionBeanProducerFieldWithTooManyScopeTypes_Broken.class).build(); } @Test(groups = INTEGRATION) @@ -40,4 +42,4 @@ public static WebArchive createTestArchive() { public void testTooManyScopesSpecifiedInJava() { } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldWithTooManyScopeTypes_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldWithTooManyScopeTypes_Broken.java index b21ababf38..c2adb390f4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldWithTooManyScopeTypes_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/SessionBeanProducerFieldWithTooManyScopeTypes_Broken.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.field; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.ConversationScoped; -import jakarta.enterprise.context.SessionScoped; -import jakarta.enterprise.inject.Produces; - -@Stateful -public class SessionBeanProducerFieldWithTooManyScopeTypes_Broken { - @Produces - @SessionScoped - @ConversationScoped - @Word - public static String word = "producer_field"; +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.field; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.ConversationScoped; +import jakarta.enterprise.context.SessionScoped; +import jakarta.enterprise.inject.Produces; + +@Stateful +public class SessionBeanProducerFieldWithTooManyScopeTypes_Broken { + @Produces + @SessionScoped + @ConversationScoped + @Word + public static String word = "producer_field"; } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/Word.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/Word.java index ebb74dcfdf..ed38b45d42 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/Word.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/field/Word.java @@ -6,27 +6,27 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.field; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Word { -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodTooManyScopesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodTooManyScopesTest.java index 5ac9952551..42ab9af7d6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodTooManyScopesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodTooManyScopesTest.java @@ -6,14 +6,18 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.method; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.DECLARING_BEAN_SCOPE; + import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -23,16 +27,14 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.DECLARING_BEAN_SCOPE; - @SpecVersion(spec = "cdi", version = "2.0") public class SessionBeanProducerMethodTooManyScopesTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClass(SessionBeanProducerMethodTooManyScopesTest.class).withClass(SessionBeanProducerMethodWithTooManyScopeTypes_Broken.class).build(); + return new WebArchiveBuilder().withTestClass(SessionBeanProducerMethodTooManyScopesTest.class) + .withClass(SessionBeanProducerMethodWithTooManyScopeTypes_Broken.class).build(); } @Test(groups = INTEGRATION) @@ -40,4 +42,4 @@ public static WebArchive createTestArchive() { public void testTooManyScopesSpecifiedInJava() { } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodWithTooManyScopeTypes_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodWithTooManyScopeTypes_Broken.java index cebeb555b2..eb897d4e69 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodWithTooManyScopeTypes_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/SessionBeanProducerMethodWithTooManyScopeTypes_Broken.java @@ -1,30 +1,30 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.method; - -import jakarta.ejb.Stateless; -import jakarta.enterprise.context.ConversationScoped; -import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Produces; - -@Stateless -public class SessionBeanProducerMethodWithTooManyScopeTypes_Broken { - @Produces - @ConversationScoped - @Dependent - @Word - public static String getWord() { - return "producer_method"; - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.method; + +import jakarta.ejb.Stateless; +import jakarta.enterprise.context.ConversationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Produces; + +@Stateless +public class SessionBeanProducerMethodWithTooManyScopeTypes_Broken { + @Produces + @ConversationScoped + @Dependent + @Word + public static String getWord() { + return "producer_method"; + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/Word.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/Word.java index 2fedf6f5c9..5f28f3178d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/Word.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/broken/tooManyScopes/ejb/producer/method/Word.java @@ -6,27 +6,27 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.definition.scope.broken.tooManyScopes.ejb.producer.method; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier public @interface Word { -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTiger.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTiger.java index 8a8cb93c22..36926d6cca 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTiger.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTiger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTigerLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTigerLocal.java index fe8fe11ea0..d63c5883b5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTigerLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BengalTigerLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollie.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollie.java index 383b3d222f..e77f95923e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollie.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.enterprise; - -import jakarta.ejb.Stateful; - -@Stateful -public class BorderCollie extends Dog implements BorderCollieLocal { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.enterprise; + +import jakarta.ejb.Stateful; + +@Stateful +public class BorderCollie extends Dog implements BorderCollieLocal { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollieLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollieLocal.java index d993fa2289..e5ef2f98cb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollieLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/BorderCollieLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface BorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface BorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Cat.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Cat.java index c6aaa50894..0046734b7c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Cat.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Cat.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Dog.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Dog.java index 9e57285dc2..dfb3c4f179 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Dog.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Dog.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.enterprise; - -import jakarta.enterprise.context.RequestScoped; - -@RequestScoped -public class Dog { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.enterprise; + +import jakarta.enterprise.context.RequestScoped; + +@RequestScoped +public class Dog { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java index 2095a7198e..24a9ffe160 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollie.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.enterprise; - -import jakarta.ejb.Stateful; - -@Stateful -public class EnglishBorderCollie extends BorderCollie implements EnglishBorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.enterprise; + +import jakarta.ejb.Stateful; + +@Stateful +public class EnglishBorderCollie extends BorderCollie implements EnglishBorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java index 5fc84daeaf..7626210313 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnglishBorderCollieLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.scope.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface EnglishBorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.scope.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface EnglishBorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java index 97d0953cf2..a1bbb04e08 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/FooScoped.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/FooScoped.java index 193e694ccb..e9edf7659c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/FooScoped.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/FooScoped.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Siamese.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Siamese.java index 58ecb0da9c..5d210bea31 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Siamese.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Siamese.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/SiameseLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/SiameseLocal.java index 4ab4aa6715..cc9f406303 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/SiameseLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/SiameseLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Tiger.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Tiger.java index 7f2329590b..0018dbe747 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Tiger.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/scope/enterprise/Tiger.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java index bcc67ac20b..32d98bc6e1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeSpecializeTest.java @@ -23,8 +23,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; @@ -33,7 +31,7 @@ /** * @author Martin Kouba - * + * */ @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java index 7e9912932f..f6535ed947 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/EnterpriseStereotypeAlternativeTest.java @@ -23,8 +23,6 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecAssertions; @@ -33,7 +31,7 @@ /** * @author Martin Kouba - * + * */ @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/Mock.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/Mock.java index 612691c893..8ae04bba30 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/Mock.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/alternative/enterprise/Mock.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Animal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Animal.java index a94a25bc60..2b6c8210fd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Animal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +public interface Animal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java index 792fc5cc33..88cc92330f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/AnimalStereotype.java @@ -1,35 +1,35 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Stereotype; - -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@Inherited -public @interface AnimalStereotype { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Stereotype; + +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@Inherited +public @interface AnimalStereotype { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Barracuda.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Barracuda.java index d08dd6f004..86191d29f5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Barracuda.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Barracuda.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java index 7476da04e4..7d23bdf3e5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollie.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollie.java index 5a6ce145cb..65c83f1943 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollie.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import jakarta.ejb.Stateful; - -@Stateful -public class BorderCollie extends LongHairedDog implements BorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import jakarta.ejb.Stateful; + +@Stateful +public class BorderCollie extends LongHairedDog implements BorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollieLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollieLocal.java index 4b925e211d..fb04989b77 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollieLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/BorderCollieLocal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -public interface BorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +public interface BorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Chihuahua.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Chihuahua.java index bd5f9cb524..5bb45083ce 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Chihuahua.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Chihuahua.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import jakarta.ejb.Stateful; - -@Stateful -public class Chihuahua extends ShortHairedDog implements ChihuahuaLocal { - - /** - * - */ - private static final long serialVersionUID = -9140665279312580651L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import jakarta.ejb.Stateful; + +@Stateful +public class Chihuahua extends ShortHairedDog implements ChihuahuaLocal { + + /** + * + */ + private static final long serialVersionUID = -9140665279312580651L; + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java index a75982ec25..06943f085b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ChihuahuaLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface ChihuahuaLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface ChihuahuaLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollie.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollie.java index 381fc731a1..512988da2f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollie.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import jakarta.ejb.Stateful; - -@Stateful -public class EnglishBorderCollie extends BorderCollie implements EnglishBorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import jakarta.ejb.Stateful; + +@Stateful +public class EnglishBorderCollie extends BorderCollie implements EnglishBorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollieLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollieLocal.java index bce86068ab..b998d5aff8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollieLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnglishBorderCollieLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface EnglishBorderCollieLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface EnglishBorderCollieLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java index 2c4b91bc78..bca2266ab1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Fish.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Fish.java index 2ec35a1ecb..cf14326c18 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Fish.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/Fish.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/FishStereotype.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/FishStereotype.java index f6e58cf14d..57f0b9f058 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/FishStereotype.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/FishStereotype.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/LongHairedDog.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/LongHairedDog.java index 0ab9b02a6e..841fdc853b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/LongHairedDog.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/LongHairedDog.java @@ -1,19 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -@AnimalStereotype -public class LongHairedDog implements Animal { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +@AnimalStereotype +public class LongHairedDog implements Animal { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java index 4d1d6cbb4e..f5103146cc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahua.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import jakarta.ejb.Stateful; - -@Stateful -public class MexicanChihuahua extends Chihuahua implements MexicanChihuahuaLocal { - - /** - * - */ - private static final long serialVersionUID = 6851776906570623607L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import jakarta.ejb.Stateful; + +@Stateful +public class MexicanChihuahua extends Chihuahua implements MexicanChihuahuaLocal { + + /** + * + */ + private static final long serialVersionUID = 6851776906570623607L; + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java index 91a4f0cf2f..4db6fce31c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/MexicanChihuahuaLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface MexicanChihuahuaLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface MexicanChihuahuaLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java index 5f465b8df4..ffa5e3d41b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/ShortHairedDog.java @@ -1,29 +1,29 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; - -import java.io.Serializable; - -import jakarta.enterprise.context.SessionScoped; - -@AnimalStereotype -@SessionScoped -public class ShortHairedDog implements Animal, Serializable { - - /** - * - */ - private static final long serialVersionUID = 8316028446413430833L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.enterprise; + +import java.io.Serializable; + +import jakarta.enterprise.context.SessionScoped; + +@AnimalStereotype +@SessionScoped +public class ShortHairedDog implements Animal, Serializable { + + /** + * + */ + private static final long serialVersionUID = 8316028446413430833L; + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracuda.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracuda.java index 25130d1b61..b8bcba4bbf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracuda.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracuda.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java index abe01aee27..6ea10a63de 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaBinding.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaBinding.java index f2d179bdee..b76c264b7a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaInterceptor.java index dd9a2d9d29..a227b21752 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaStereotype.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaStereotype.java index 842a5dcf9d..8990269f78 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaStereotype.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/AlphaStereotype.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.definition.stereotype.interceptor.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.enterprise.inject.Stereotype; - -@AlphaBinding -@Stereotype -@Target({ TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -public @interface AlphaStereotype { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.definition.stereotype.interceptor.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.enterprise.inject.Stereotype; + +@AlphaBinding +@Stereotype +@Target({ TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +public @interface AlphaStereotype { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java index 84a8dd57ee..093c234d36 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/EnterpriseStereotypeInterceptorBindingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.INTERCEPTORS_EE; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -29,7 +30,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @Test(groups = INTEGRATION) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/Foo.java index 4f8d5d6530..3ffc5b07cf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/stereotype/interceptor/enterprise/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java index eb8b0bfe8a..c3a7be7000 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/EnterpriseBeanDiscoveryTest.java @@ -65,7 +65,8 @@ public static EnterpriseArchive createTestArchive() { .create(JavaArchive.class, ALPHA_JAR) .addClasses(Alpha.class, AlphaLocal.class) .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).exportAsString()), + new StringAsset(Descriptors.create(BeansDescriptor.class) + .beanDiscoveryMode(BeanDiscoveryMode._ALL.toString()).exportAsString()), "beans.xml"); // Empty beans.xml JavaArchive bravo = ShrinkWrap.create(JavaArchive.class, BRAVO_JAR).addClasses(Bravo.class, BravoLocal.class) @@ -74,7 +75,8 @@ public static EnterpriseArchive createTestArchive() { JavaArchive charlie = ShrinkWrap .create(JavaArchive.class, CHARLIE_JAR) .addClasses(Charlie.class, CharlieLocal.class) - .addAsManifestResource(new StringAsset(Descriptors.create(BeansDescriptor.class).exportAsString()), "beans.xml"); + .addAsManifestResource(new StringAsset(Descriptors.create(BeansDescriptor.class).exportAsString()), + "beans.xml"); // Session bean and no beans.xml JavaArchive delta = ShrinkWrap.create(JavaArchive.class, DELTA_JAR).addClasses(Delta.class, DeltaLocal.class); // Session bean and 1.1 version beans.xml with bean-discovery-mode of annotated @@ -82,14 +84,16 @@ public static EnterpriseArchive createTestArchive() { .create(JavaArchive.class, ECHO_JAR) .addClasses(Echo.class, EchoLocal.class) .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._ANNOTATED.toString()).exportAsString()), + new StringAsset(Descriptors.create(BeansDescriptor.class) + .beanDiscoveryMode(BeanDiscoveryMode._ANNOTATED.toString()).exportAsString()), "beans.xml"); // Session bean and 1.1 version beans.xml with bean-discovery-mode of none JavaArchive foxtrot = ShrinkWrap .create(JavaArchive.class, FOXTROT_JAR) .addClasses(Foxtrot.class, FoxtrotLocal.class) .addAsManifestResource( - new StringAsset(Descriptors.create(BeansDescriptor.class).beanDiscoveryMode(BeanDiscoveryMode._NONE.toString()).exportAsString()), + new StringAsset(Descriptors.create(BeansDescriptor.class) + .beanDiscoveryMode(BeanDiscoveryMode._NONE.toString()).exportAsString()), "beans.xml"); // Archive which contains an extension and no beans.xml file - not a bean archive @@ -117,40 +121,46 @@ public static EnterpriseArchive createTestArchive() { VerifyingExtension extension; @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "ba"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "ba"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc") }) public void testExplicitBeanArchiveModeAll() { assertDiscoveredAndAvailable(AlphaLocal.class, Alpha.class); } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "bb"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "bc"), + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "bb"), + @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "bc"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc") }) public void testExplicitBeanArchiveEmptyDescriptor() { assertDiscoveredAndAvailable(BravoLocal.class, Bravo.class); } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "bc"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "bc"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc") }) public void testExplicitBeanArchiveLegacyDescriptor() { assertDiscoveredAndAvailable(CharlieLocal.class, Charlie.class); } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = DEFAULT_BEAN_DISCOVERY_EE, id = "a"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc"), + @SpecAssertions({ @SpecAssertion(section = DEFAULT_BEAN_DISCOVERY_EE, id = "a"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc"), @SpecAssertion(section = BEAN_DEFINING_ANNOTATIONS, id = "ba") }) public void testImplicitBeanArchiveNoDescriptor() { assertDiscoveredAndAvailable(DeltaLocal.class, Delta.class); } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = DEFAULT_BEAN_DISCOVERY_EE, id = "a"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc"), + @SpecAssertions({ @SpecAssertion(section = DEFAULT_BEAN_DISCOVERY_EE, id = "a"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc"), @SpecAssertion(section = BEAN_DEFINING_ANNOTATIONS, id = "ba") }) public void testImplicitBeanArchiveModeAnnotated() { assertDiscoveredAndAvailable(EchoLocal.class, Echo.class); } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "oa"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "oa"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "tc") }) public void testNoBeanArchiveModeNone() { assertNotDiscoveredAndNotAvailable(FoxtrotLocal.class, Foxtrot.class); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTree.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTree.java index 2123ec5650..3574b9879b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTree.java @@ -20,22 +20,21 @@ @Stateless public class AppleTree implements AppleTreeLocal { - + @Produces static Apple apple = new Apple(); - + @Produces - public Apple produceApple(){ - return new Apple(); + public Apple produceApple() { + return new Apple(); } - - public void eatApple(@Disposes Apple apple){ + + public void eatApple(@Disposes Apple apple) { } - - public void fallDown(@Observes Apple apple){ + + public void fallDown(@Observes Apple apple) { } - - + } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTreeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTreeLocal.java index e5941258ea..0bd3923814 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTreeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/AppleTreeLocal.java @@ -17,10 +17,10 @@ @Local public interface AppleTreeLocal { - + Apple produceApple(); - + void eatApple(Apple apple); - + void fallDown(Apple apple); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java index 647378386f..cb9fa4186e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/EnterpriseDefaultBeanDiscoveryModeTest.java @@ -28,9 +28,9 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; +import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.BeansXmlVersion; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; @@ -50,9 +50,9 @@ public class EnterpriseDefaultBeanDiscoveryModeTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(EnterpriseDefaultBeanDiscoveryModeTest.class) .withBeansXml(new BeansXml() - .setBeansXmlVersion(BeansXmlVersion.v11) - .setBeanDiscoveryMode(BeanDiscoveryMode.ANNOTATED) - ) + .setBeansXmlVersion(BeansXmlVersion.v11) + .setBeanDiscoveryMode(BeanDiscoveryMode.ANNOTATED) + ) .withExtension(TestExtension.class).build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/TestExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/TestExtension.java index 4c13a750d7..5817f88b3b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/TestExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/enterprise/annotated/TestExtension.java @@ -49,5 +49,4 @@ public AnnotatedField getProducerField() { return producerField; } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java index a7c22cc864..b9b3aa5a3f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DefaultBeanDiscoveryModeTest.java @@ -31,7 +31,6 @@ import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; @@ -50,10 +49,10 @@ public class DefaultBeanDiscoveryModeTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder() - .withBeansXml(new BeansXml(BeanDiscoveryMode.ANNOTATED)) - .withTestClass(DefaultBeanDiscoveryModeTest.class) - .withExtension(TestExtension.class) - .withPackage(DefaultBeanDiscoveryModeTest.class.getPackage()).build(); + .withBeansXml(new BeansXml(BeanDiscoveryMode.ANNOTATED)) + .withTestClass(DefaultBeanDiscoveryModeTest.class) + .withExtension(TestExtension.class) + .withPackage(DefaultBeanDiscoveryModeTest.class.getPackage()).build(); } @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DummyBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DummyBean.java index c4938dbf06..9e88adfdf8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DummyBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/DummyBean.java @@ -18,9 +18,10 @@ /** * This bean has bean defining annotation hence is picked up in implicit archive. * It serves no other purpose and is not used in the tests. + * * @author Matej Novotny */ @ApplicationScoped public class DummyBean { - + } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/TestExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/TestExtension.java index f6a3c9d636..36a0632855 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/TestExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/discovery/implicit/TestExtension.java @@ -23,22 +23,22 @@ import jakarta.enterprise.inject.spi.ProcessProducerMethod; public class TestExtension implements Extension { - + public static AtomicInteger processProducerMethodCounter = new AtomicInteger(); public static AtomicInteger processProducerFieldCounter = new AtomicInteger(); public static AtomicInteger processObserverCounter = new AtomicInteger(); public static AnnotatedParameter disposerParam; - - public void processProducerMethod(@Observes ProcessProducerMethod event){ + + public void processProducerMethod(@Observes ProcessProducerMethod event) { processProducerMethodCounter.incrementAndGet(); disposerParam = event.getAnnotatedDisposedParameter(); } - public void processProducerField(@Observes ProcessProducerField event){ + public void processProducerField(@Observes ProcessProducerField event) { processProducerFieldCounter.incrementAndGet(); } - public void processObserverMethod(@Observes ProcessObserverMethod event){ + public void processObserverMethod(@Observes ProcessObserverMethod event) { processObserverCounter.incrementAndGet(); - } + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Bar.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Bar.java index 042ecad067..14c1ad81b8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Dependent public class Bar { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Baz.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Baz.java index b05aa2868b..c6f06ec44a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Baz.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Foo.java index fd8155956d..4196ceca28 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Dependent public class Foo { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Unlucky.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Unlucky.java index 37b1353bf7..4447b75b62 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Unlucky.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/bundledLibrary/Unlucky.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/BarWebBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/BarWebBean.java index 3596eab2d0..57627c2165 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/BarWebBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/BarWebBean.java @@ -18,7 +18,7 @@ import jakarta.inject.Inject; /** - * + * * @author Martin Kouba */ @Dependent diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/FooWebBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/FooWebBean.java index d7070bc6fe..ac88249846 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/FooWebBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/FooWebBean.java @@ -18,7 +18,7 @@ import jakarta.inject.Inject; /** - * + * * @author Martin Kouba */ @Dependent diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/MultiWebModuleWithExtensionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/MultiWebModuleWithExtensionTest.java index 3a9bf04756..391a8a7931 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/MultiWebModuleWithExtensionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/MultiWebModuleWithExtensionTest.java @@ -73,7 +73,8 @@ public static EnterpriseArchive createTestArchive() { } @Test(groups = JAVAEE_FULL, dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jc"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "je") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jc"), + @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "je") }) public void testMultipleWebModulesWithExtension(FooBean fooBean) { assertNotNull(fooBean); assertNotNull(fooBean.getExtension()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/SingleWebModuleWithExtensionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/SingleWebModuleWithExtensionTest.java index c08659e004..67093430d3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/SingleWebModuleWithExtensionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/SingleWebModuleWithExtensionTest.java @@ -67,7 +67,8 @@ public static EnterpriseArchive createTestArchive() { FooWebBean fooWebBean; @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jc"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "je") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jc"), + @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "je") }) public void testSingleWebModuleWithExtension() { fooWebBean.ping(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java index bdf3c2bc3a..780cb90c0e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/EnterpriseArchiveModulesTest.java @@ -36,9 +36,8 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; -import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; -import org.jboss.cdi.tck.util.Versions; +import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.BeansXmlVersion; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -101,12 +100,12 @@ public static EnterpriseArchive createTestArchive() { // B - not visible for ACD JavaArchive barArchive = ShrinkWrap .create(JavaArchive.class, "bar-ejb.jar") - .addClasses(Bar.class, AlternativeBar.class, BarInspector.class, ContainerEventsObserver.class, LegacyServiceProducer.class) + .addClasses(Bar.class, AlternativeBar.class, BarInspector.class, ContainerEventsObserver.class, + LegacyServiceProducer.class) .addAsServiceProvider(Extension.class, ContainerEventsObserver.class) .addAsManifestResource(new BeansXml().setBeansXmlVersion(BeansXmlVersion.v11) - .setBeanDiscoveryMode(BeanDiscoveryMode.ALL) - .interceptors(SecurityInterceptor.class) - , "beans.xml") + .setBeanDiscoveryMode(BeanDiscoveryMode.ALL) + .interceptors(SecurityInterceptor.class), "beans.xml") // Make A visible in a portable way .setManifest( new StringAsset(Descriptors.create(ManifestDescriptor.class) @@ -155,7 +154,8 @@ public void testExtensionAndContainerEvents() throws Exception { } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "ja"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jb"), + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "ja"), + @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jb"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jc"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "je"), @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "n") }) public void testVisibilityAndInterceptorEnablement() throws Exception { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/LoggingDecorator.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/LoggingDecorator.java index fd578a62f9..3b0439602e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/LoggingDecorator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/LoggingDecorator.java @@ -23,7 +23,7 @@ /** * @author Martin Kouba - * + * */ @Decorator public abstract class LoggingDecorator implements Business { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/NonEnterprise.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/NonEnterprise.java index 0ef31cf302..5a8daeffa1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/NonEnterprise.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/NonEnterprise.java @@ -28,7 +28,7 @@ /** * @author Martin Kouba - * + * */ @Qualifier @Target({ TYPE, METHOD, PARAMETER, FIELD }) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/Secured.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/Secured.java index 0a9c15c6f5..3c471dbe7d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/Secured.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ear/modules/Secured.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/Bar.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/Bar.java index 0a4397f46a..b2b9ee0cb3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/Bar.java @@ -14,7 +14,6 @@ package org.jboss.cdi.tck.tests.deployment.packaging.ejb; - public class Bar { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java index 4949e52c70..781ac1e5ea 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/EJBJarDeploymentTest.java @@ -26,14 +26,9 @@ import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; -import org.jboss.cdi.tck.util.Versions; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeanDiscoveryMode; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooBean.java index e03622a943..59a0779420 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooRemote.java index 52c0658ca4..a50e53b202 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/ejb/FooRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/installedLibrary/Bravo.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/installedLibrary/Bravo.java index f5159e865f..0188809827 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/installedLibrary/Bravo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/installedLibrary/Bravo.java @@ -16,6 +16,6 @@ import jakarta.enterprise.context.Dependent; @Dependent -public class Bravo extends AssertBean { +public class Bravo extends AssertBean { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java index 155b68eb9b..10e3289244 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/ResourceAdapterArchiveTest.java @@ -64,7 +64,8 @@ public static EnterpriseArchive createTestArchive() { .vendorName("Red Hat Middleware LLC").eisType("Test RA").resourceadapterVersion("0.1") .getOrCreateResourceadapter().resourceadapterClass(TestResourceAdapter.class.getName()) .getOrCreateOutboundResourceadapter().transactionSupport("NoTransaction") - .reauthenticationSupport(false).up().up().exportAsString()), "ra.xml"); + .reauthenticationSupport(false).up().up().exportAsString()), + "ra.xml"); enterpriseArchive.addAsModule(rar); return enterpriseArchive; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/TestResourceAdapter.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/TestResourceAdapter.java index 70c90d60c1..78d0b011d8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/TestResourceAdapter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/rar/TestResourceAdapter.java @@ -15,17 +15,18 @@ import java.util.logging.Logger; +import javax.transaction.xa.XAResource; + import jakarta.resource.ResourceException; import jakarta.resource.spi.ActivationSpec; import jakarta.resource.spi.BootstrapContext; import jakarta.resource.spi.ResourceAdapter; import jakarta.resource.spi.ResourceAdapterInternalException; import jakarta.resource.spi.endpoint.MessageEndpointFactory; -import javax.transaction.xa.XAResource; /** * TestResourceAdapter - * + * * @version $Revision: $ */ public class TestResourceAdapter implements ResourceAdapter, java.io.Serializable { @@ -45,7 +46,7 @@ public TestResourceAdapter() { /** * This is called during the activation of a message endpoint. - * + * * @param endpointFactory A message endpoint factory instance. * @param spec An activation spec JavaBean instance. * @throws ResourceException generic exception @@ -56,7 +57,7 @@ public void endpointActivation(MessageEndpointFactory endpointFactory, Activatio /** * This is called when a message endpoint is deactivated. - * + * * @param endpointFactory A message endpoint factory instance. * @param spec An activation spec JavaBean instance. */ @@ -66,7 +67,7 @@ public void endpointDeactivation(MessageEndpointFactory endpointFactory, Activat /** * This is called when a resource adapter instance is bootstrapped. - * + * * @param ctx A bootstrap context containing references * @throws ResourceAdapterInternalException indicates bootstrap failure. */ @@ -83,7 +84,7 @@ public void stop() { /** * This method is called by the application server during crash recovery. - * + * * @param specs An array of ActivationSpec JavaBeans * @throws ResourceException generic exception * @return An array of XAResource objects @@ -95,7 +96,7 @@ public XAResource[] getXAResources(ActivationSpec[] specs) throws ResourceExcept /** * Returns a hash code value for the object. - * + * * @return A hash code value for this object. */ @Override @@ -106,7 +107,7 @@ public int hashCode() { /** * Indicates whether some other object is equal to this one. - * + * * @param other The reference object with which to compare. * @return true if this object is the same as the obj argument, false otherwise. */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarAlphaVisibilityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarAlphaVisibilityTest.java index 2824fbd1d1..56eebe8491 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarAlphaVisibilityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarAlphaVisibilityTest.java @@ -46,7 +46,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jh"), @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "n") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jh"), + @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "n") }) public void testDeployment() { // noop } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarReverseAlphaVisibilityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarReverseAlphaVisibilityTest.java index c48601ec77..096827886c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarReverseAlphaVisibilityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/JarToJarReverseAlphaVisibilityTest.java @@ -48,7 +48,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jh"), @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "n") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jh"), + @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "n") }) public void testDeployment() { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java index 8adf867372..42f4839885 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInAlphaBeanArchiveTest.java @@ -31,11 +31,11 @@ /** * Tests whether an extension that observes annotated types, when put in a library with a higher order name (alpha.jar), is * notified of annotated types in a library with a lower order name (bravo.jar). - * + * *

    * This test was originally part of Seam Compatibility project. *

    - * + * * @author Dan Allen * @author Martin Kouba * @see GLASSFISH-15735 diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java index 0d21bfee8a..00d073fe57 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/visibility/VisibilityOfAnnotatedTypesFromExtensionInBravoBeanArchiveTest.java @@ -31,11 +31,11 @@ /** * Tests whether an extension that observes annotated types, when put in a library with a lower order name (bravo.jar), is * notified of annotated types in a library with a higher order name (alpha.jar). - * + * *

    * This test was originally part of Seam Compatibility project. *

    - * + * * @author Dan Allen * @author Martin Kouba * @see GLASSFISH-15735 (unresolved) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Bazinga.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Bazinga.java index d85f4824c4..b89e049f84 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Bazinga.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Bazinga.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/ContainerEventsObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/ContainerEventsObserver.java index 6d9b551739..546e795d15 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/ContainerEventsObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/ContainerEventsObserver.java @@ -81,7 +81,8 @@ public void observeProcessBean(@Observes ProcessManagedBean event, BeanMana isProcessManagedBeanOk = (beanManager != null); } - public void observeProcessObserverMethod(@Observes ProcessObserverMethod event, BeanManager beanManager) { + public void observeProcessObserverMethod(@Observes ProcessObserverMethod event, + BeanManager beanManager) { isProcessObserverMethodOk = (beanManager != null); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/LoggingDecorator.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/LoggingDecorator.java index 413f70728b..872cc50096 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/LoggingDecorator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/LoggingDecorator.java @@ -22,7 +22,7 @@ /** * @author Martin Kouba - * + * */ @Decorator public abstract class LoggingDecorator implements Business { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Secured.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Secured.java index 8527de11c8..a18ff91e22 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Secured.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/Secured.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java index a57b55cc41..36fb369e20 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/packaging/war/modules/WebArchiveModulesTest.java @@ -27,9 +27,12 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.util.Set; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -40,8 +43,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.Set; - /** * This test is aimed to verify packaging-related issues in a little bit more complex deployment scenario. The assertions are * rather informative and redundant as they're already verified in elementary tests. @@ -74,7 +75,8 @@ public static WebArchive createTestArchive() { .withBeanLibrary(new BeansXml().interceptors(SecurityInterceptor.class), Bar.class, AlternativeBar.class, BarInspector.class) // C - .withBeanLibrary(new BeansXml().decorators(LoggingDecorator.class), Baz.class, LoggingDecorator.class, Bazinga.class) + .withBeanLibrary(new BeansXml().decorators(LoggingDecorator.class), Baz.class, LoggingDecorator.class, + Bazinga.class) // D .withBeanLibrary(Qux.class, ContainerEventsObserver.class, LegacyServiceProducer.class) // E @@ -92,7 +94,8 @@ public void testExtensionAndContainerEvents() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jg"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jh"), + @SpecAssertions({ @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jg"), + @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "jh"), @SpecAssertion(section = PERFORMING_TYPESAFE_RESOLUTION, id = "n") }) public void testInjectionChainVisibilityAndInterceptorEnablement() { // Test injection chain, visibility, SecurityInterceptor is enabled in B only @@ -104,7 +107,8 @@ public void testInjectionChainVisibilityAndInterceptorEnablement() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa"), @SpecAssertion(section = ENABLED_DECORATORS_BEAN_ARCHIVE, id = "a"), + @SpecAssertions({ @SpecAssertion(section = DECORATOR_RESOLUTION, id = "aa"), + @SpecAssertion(section = ENABLED_DECORATORS_BEAN_ARCHIVE, id = "a"), @SpecAssertion(section = OBSERVER_RESOLUTION, id = "c") }) public void testDecoratorAndCrossModuleEventObserver() throws Exception { // Test LoggingDecorator is enabled in C only; bean from D observes event from A diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/ApplicationShutdownLifecycleTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/ApplicationShutdownLifecycleTest.java index 09a9910b42..6a61cc8216 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/ApplicationShutdownLifecycleTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/ApplicationShutdownLifecycleTest.java @@ -30,8 +30,6 @@ import jakarta.enterprise.context.SessionScoped; import jakarta.enterprise.inject.spi.BeforeShutdown; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; @@ -48,6 +46,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + /** * Test application shutdown lifecycle. * @@ -73,7 +74,9 @@ public static WebArchive createFooTestArchive() { @Deployment(name = INFO, managed = false, testable = false) public static WebArchive createBarTestArchive() { return new WebArchiveBuilder().notTestArchive() - .withClasses(InfoServlet.class, ActionSequence.class, TransformationUtils.class, TransformationUtils.Function.class).build(); + .withClasses(InfoServlet.class, ActionSequence.class, TransformationUtils.class, + TransformationUtils.Function.class) + .build(); } @ArquillianResource @@ -99,7 +102,8 @@ public void deployArchives() { */ @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ @SpecAssertion(section = SHUTDOWN, id = "a"), @SpecAssertion(section = SHUTDOWN, id = "b"), - @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "ja"), @SpecAssertion(section = APPLICATION_CONTEXT_EE, id = "ga"), + @SpecAssertion(section = REQUEST_CONTEXT_EE, id = "ja"), + @SpecAssertion(section = APPLICATION_CONTEXT_EE, id = "ga"), @SpecAssertion(section = BEFORE_SHUTDOWN, id = "a") }) public void testShutdown(@ArquillianResource @OperateOnDeployment(FOO) URL fooContext, @ArquillianResource @OperateOnDeployment(INFO) URL infoContext) throws Exception { @@ -118,7 +122,8 @@ public void testShutdown(@ArquillianResource @OperateOnDeployment(FOO) URL fooCo assertTrue(actual.endsWith(BeforeShutdown.class.getName())); actual.assertDataContainsAll(RequestScoped.class.getName(), SessionScoped.class.getName(), ApplicationScoped.class.getName(), - ConversationScoped.class.getName(), Foo.class.getName(), Bar.class.getName(), Baz.class.getName(), Qux.class.getName()); + ConversationScoped.class.getName(), Foo.class.getName(), Bar.class.getName(), Baz.class.getName(), + Qux.class.getName()); // Undeploy info deployer.undeploy(INFO); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/LifecycleMonitoringExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/LifecycleMonitoringExtension.java index 591171044d..cc87e06889 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/LifecycleMonitoringExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/deployment/shutdown/LifecycleMonitoringExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ import jakarta.enterprise.inject.spi.Extension; /** - * + * * @author Martin Kouba */ public class LifecycleMonitoringExtension implements Extension { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java index 3156a6c949..81522b2711 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/EJBObserverMethodNotBusinessMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,7 @@ /** * Test an observer method on an EJB that is neither a business method nor a static method of the class. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/Terrier.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/Terrier.java index 42e62953b7..7af9a12aac 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/Terrier.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/Terrier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java index 327151b220..c2dc4f7ea0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBAsyncObserverMethodRemoteBusinessMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBAsyncObserverMethodRemoteBusinessMethodTest.java index 43f5789fe0..c2dc7f662f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBAsyncObserverMethodRemoteBusinessMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBAsyncObserverMethodRemoteBusinessMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -35,7 +35,8 @@ public class EJBAsyncObserverMethodRemoteBusinessMethodTest extends AbstractTest @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withClasses(Terrier.class, FoxTerrrier.class).withTestClass(EJBAsyncObserverMethodRemoteBusinessMethodTest.class) + return new WebArchiveBuilder().withClasses(Terrier.class, FoxTerrrier.class) + .withTestClass(EJBAsyncObserverMethodRemoteBusinessMethodTest.class) .build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBObserverMethodRemoteBusinessMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBObserverMethodRemoteBusinessMethodTest.java index 1066dd6928..65a5670865 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBObserverMethodRemoteBusinessMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/EJBObserverMethodRemoteBusinessMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -35,7 +35,8 @@ public class EJBObserverMethodRemoteBusinessMethodTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withClasses(Terrier.class, TibetanTerrier.class).withTestClass(EJBObserverMethodRemoteBusinessMethodTest.class).build(); + return new WebArchiveBuilder().withClasses(Terrier.class, TibetanTerrier.class) + .withTestClass(EJBObserverMethodRemoteBusinessMethodTest.class).build(); } @Test(groups = { INTEGRATION, JAVAEE_FULL }) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/FoxTerrrier.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/FoxTerrrier.java index 6b2ee52cde..2e9f0b37a6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/FoxTerrrier.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/FoxTerrrier.java @@ -17,10 +17,10 @@ import jakarta.enterprise.event.ObservesAsync; @Stateless -public class FoxTerrrier implements Terrier{ +public class FoxTerrrier implements Terrier { @Override - public void observeSomeEvent(@ObservesAsync String someEvent) { + public void observeSomeEvent(@ObservesAsync String someEvent) { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/Terrier.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/Terrier.java index bcb16401a6..2b5e6494f9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/Terrier.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/Terrier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,5 +18,5 @@ @Remote public interface Terrier { - void observeSomeEvent(String someEvent); + void observeSomeEvent(String someEvent); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/TibetanTerrier.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/TibetanTerrier.java index 0711d4868d..b312aac6a8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/TibetanTerrier.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/broken/observer/remoteBusinessMethod/TibetanTerrier.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,8 +18,8 @@ @Stateless public class TibetanTerrier implements Terrier { - + public void observeSomeEvent(@Observes String someEvent) { - + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/FooObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/FooObserver.java index 7f4eb8c660..4d9d51e965 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/FooObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/FooObserver.java @@ -16,11 +16,12 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; +import javax.naming.InitialContext; + import jakarta.ejb.EJB; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.event.Observes; import jakarta.enterprise.event.TransactionPhase; -import javax.naming.InitialContext; import jakarta.transaction.TransactionSynchronizationRegistry; import org.jboss.cdi.tck.util.ActionSequence; @@ -35,7 +36,7 @@ public class FooObserver { private Printer printer; private static TransactionSynchronizationRegistry tsr; - + public void observeInProgress(@Observes(during = TransactionPhase.IN_PROGRESS) Foo foo) throws Exception { // this observer method is called first and we do not have to look up TransactionSynchronizationRegistry each time if (tsr == null) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncMessageObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncMessageObserver.java index 448ff2e09e..eaafc7999f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncMessageObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncMessageObserver.java @@ -32,10 +32,10 @@ public class AsyncMessageObserver { @Inject Counter counter; - + @Inject BeanManager bm; - + public static AtomicBoolean requestScopeActive = new AtomicBoolean(false); public static AtomicInteger status = new AtomicInteger(); @@ -51,5 +51,4 @@ public void observe(@ObservesAsync String text) { counterIsZero.set(counter.getCount().get() > 0 ? false : true); } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncObserverMethodInvocationContextTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncObserverMethodInvocationContextTest.java index 1b0a0a4364..fcd6a9c86b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncObserverMethodInvocationContextTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/AsyncObserverMethodInvocationContextTest.java @@ -72,7 +72,8 @@ public void testAsyncObserverIsCalledInNewTransactionContext() throws Exception } @Test - @SpecAssertions({ @SpecAssertion(section = OBSERVER_METHOD_INVOCATION_CONTEXT, id = "aa"), @SpecAssertion(section = REQUEST_CONTEXT, id = "da") }) + @SpecAssertions({ @SpecAssertion(section = OBSERVER_METHOD_INVOCATION_CONTEXT, id = "aa"), + @SpecAssertion(section = REQUEST_CONTEXT, id = "da") }) public void testAsyncObserverIsCalledInNewRequestContext() throws Exception { counter.increment(); BlockingQueue queue = new LinkedBlockingQueue<>(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/EnterpriseSecurityContextPropagationInAsyncObserverTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/EnterpriseSecurityContextPropagationInAsyncObserverTest.java index fab7247421..5ad8763539 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/EnterpriseSecurityContextPropagationInAsyncObserverTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/EnterpriseSecurityContextPropagationInAsyncObserverTest.java @@ -46,7 +46,8 @@ public class EnterpriseSecurityContextPropagationInAsyncObserverTest extends Abs @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClassPackage(EnterpriseSecurityContextPropagationInAsyncObserverTest.class).build(); + return new WebArchiveBuilder().withTestClassPackage(EnterpriseSecurityContextPropagationInAsyncObserverTest.class) + .build(); } @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Printer.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Printer.java index 3fe4bcff72..ca16b7c0fb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Printer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Printer.java @@ -20,8 +20,8 @@ @Stateless @RolesAllowed("student") public class Printer { - - public void observes(@ObservesAsync Text text){ + + public void observes(@ObservesAsync Text text) { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Text.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Text.java index aa5bae19a5..ff35860c28 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Text.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/async/enterprise/Text.java @@ -20,9 +20,9 @@ public String getContent() { } private String content; - - public Text(String content){ + + public Text(String content) { this.content = content; - + } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/FooObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/FooObserver.java index f12d050869..62d1760496 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/FooObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/FooObserver.java @@ -17,6 +17,8 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import javax.naming.InitialContext; + import jakarta.annotation.Resource; import jakarta.annotation.security.RolesAllowed; import jakarta.ejb.EJB; @@ -24,7 +26,6 @@ import jakarta.ejb.Stateless; import jakarta.enterprise.event.Observes; import jakarta.enterprise.event.TransactionPhase; -import javax.naming.InitialContext; import jakarta.transaction.TransactionSynchronizationRegistry; import org.jboss.cdi.tck.util.ActionSequence; @@ -78,7 +79,7 @@ public void observeAfterSuccess(@Observes(during = TransactionPhase.AFTER_SUCCES } private void assertClientSecurityContext(TransactionPhase phase) { - + assertTrue(sc.isCallerInRole("printer")); toner.spill(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/staticMethod/FooObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/staticMethod/FooObserver.java index 9a3c941e46..ebc24bb4fc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/staticMethod/FooObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/context/enterprise/staticMethod/FooObserver.java @@ -17,12 +17,13 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import javax.naming.InitialContext; + import jakarta.annotation.security.DeclareRoles; import jakarta.ejb.EJBContext; import jakarta.ejb.Stateless; import jakarta.enterprise.event.Observes; import jakarta.enterprise.event.TransactionPhase; -import javax.naming.InitialContext; import jakarta.transaction.TransactionSynchronizationRegistry; import org.jboss.cdi.tck.util.ActionSequence; @@ -55,7 +56,8 @@ private static void init() throws Exception { printer = (Printer) InitialContext.doLookup("java:module/Printer"); } - public static void observeBeforeCompletion(@Observes(during = TransactionPhase.BEFORE_COMPLETION) Foo foo) throws Exception { + public static void observeBeforeCompletion(@Observes(during = TransactionPhase.BEFORE_COMPLETION) Foo foo) + throws Exception { assertEquals(tsr.getTransactionKey(), Printer.getKey(), "Before completion transactional observer method was NOT called within the context of the transaction that was about to complete."); assertClientSecurityContext(TransactionPhase.BEFORE_COMPLETION); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Egg.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Egg.java index 091d829a62..ed81ac7615 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Egg.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Egg.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -public class Egg extends EventPayload { - - public void recordVisit(FarmerLocal farmer) { - recordVisit(farmer.getName()); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +public class Egg extends EventPayload { + + public void recordVisit(FarmerLocal farmer) { + recordVisit(farmer.getName()); + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EnterpriseObserverInheritanceTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EnterpriseObserverInheritanceTest.java index ef6840ba8f..5cbc531b57 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EnterpriseObserverInheritanceTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EnterpriseObserverInheritanceTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,7 @@ /** * Event observer inheritance test with enterprise beans. - * + * * @author Shane Bryzak * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EventPayload.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EventPayload.java index 08f3bd889f..47888e953c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EventPayload.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/EventPayload.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Farmer.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Farmer.java index 7964abefbd..f5f3828169 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Farmer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/Farmer.java @@ -1,29 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.event.Observes; - -public @Stateful -class Farmer implements FarmerLocal { - public void observeEggLaying(@Observes Egg egg) { - egg.recordVisit(this); - } - - public String getName() { - return Farmer.class.getSimpleName(); - } - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.event.Observes; + +public @Stateful class Farmer implements FarmerLocal { + public void observeEggLaying(@Observes Egg egg) { + egg.recordVisit(this); + } + + public String getName() { + return Farmer.class.getSimpleName(); + } + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/FarmerLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/FarmerLocal.java index 0379b7f208..6dcf271ec4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/FarmerLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/FarmerLocal.java @@ -1,26 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Local; -import jakarta.enterprise.event.Observes; - -public @Local -interface FarmerLocal { - - void observeEggLaying(@Observes Egg egg); - - public String getName(); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Local; +import jakarta.enterprise.event.Observes; + +public @Local interface FarmerLocal { + + void observeEggLaying(@Observes Egg egg); + + public String getName(); + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcher.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcher.java index 9dba8085be..5e257a2983 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcher.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcher.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Stateful; - -public @Stateful -class IndirectStockWatcher extends IntermediateStockWatcher implements IndirectStockWatcherLocal, StockWatcherLocal { - - @Override - public String getName() { - return IndirectStockWatcher.class.getSimpleName(); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Stateful; + +public @Stateful class IndirectStockWatcher extends IntermediateStockWatcher + implements IndirectStockWatcherLocal, StockWatcherLocal { + + @Override + public String getName() { + return IndirectStockWatcher.class.getSimpleName(); + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcherLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcherLocal.java index 258c32fe5f..8b2515112b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcherLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IndirectStockWatcherLocal.java @@ -1,20 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Local; - -public @Local -interface IndirectStockWatcherLocal { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Local; + +public @Local interface IndirectStockWatcherLocal { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IntermediateStockWatcher.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IntermediateStockWatcher.java index 1c2c2205a8..706fda3f62 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IntermediateStockWatcher.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/IntermediateStockWatcher.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -public class IntermediateStockWatcher extends StockWatcher { - - @Override - public String getName() { - return IntermediateStockWatcher.class.getSimpleName(); - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +public class IntermediateStockWatcher extends StockWatcher { + + @Override + public String getName() { + return IntermediateStockWatcher.class.getSimpleName(); + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmer.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmer.java index f9bbf36146..0d8ef5b92c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmer.java @@ -1,26 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Stateful; - -public @Stateful -class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal { - - @Override - public String getName() { - return LazyFarmer.class.getSimpleName(); - } - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Stateful; + +public @Stateful class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal { + + @Override + public String getName() { + return LazyFarmer.class.getSimpleName(); + } + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmerLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmerLocal.java index 68c2c45f63..df3539c1f3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmerLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/LazyFarmerLocal.java @@ -1,20 +1,19 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Local; - -public @Local -interface LazyFarmerLocal { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Local; + +public @Local interface LazyFarmerLocal { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockPrice.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockPrice.java index 7a5ce78cd4..ac1c9a1e93 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockPrice.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockPrice.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -public class StockPrice extends EventPayload { - - public void recordVisit(StockWatcherLocal stockWatcher) { - recordVisit(stockWatcher.getName()); - } - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +public class StockPrice extends EventPayload { + + public void recordVisit(StockWatcherLocal stockWatcher) { + recordVisit(stockWatcher.getName()); + } + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcher.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcher.java index 505b43e354..ce9549f3c2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcher.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcher.java @@ -1,29 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.event.Observes; - -public @Stateful -class StockWatcher implements StockWatcherLocal { - public void observeStockPrice(@Observes StockPrice price) { - price.recordVisit(this); - } - - public String getName() { - return StockWatcher.class.getSimpleName(); - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.event.Observes; + +public @Stateful class StockWatcher implements StockWatcherLocal { + public void observeStockPrice(@Observes StockPrice price) { + price.recordVisit(this); + } + + public String getName() { + return StockWatcher.class.getSimpleName(); + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcherLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcherLocal.java index ea6f23a071..70504763a0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcherLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/inheritance/enterprise/StockWatcherLocal.java @@ -1,25 +1,24 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; - -import jakarta.ejb.Local; -import jakarta.enterprise.event.Observes; - -public @Local -interface StockWatcherLocal { - void observeStockPrice(@Observes StockPrice price); - - String getName(); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.event.observer.inheritance.enterprise; + +import jakarta.ejb.Local; +import jakarta.enterprise.event.Observes; + +public @Local interface StockWatcherLocal { + void observeStockPrice(@Observes StockPrice price); + + String getName(); + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleEventObserverOrderingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleEventObserverOrderingTest.java index 4c6c282469..7371f1215c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleEventObserverOrderingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleEventObserverOrderingTest.java @@ -19,8 +19,6 @@ import java.io.IOException; import java.net.URL; -import com.gargoylesoftware.htmlunit.TextPage; -import com.gargoylesoftware.htmlunit.WebClient; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; @@ -31,6 +29,9 @@ import org.testng.Assert; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.TextPage; +import com.gargoylesoftware.htmlunit.WebClient; + @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") public class RequestContextLifecycleEventObserverOrderingTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleObserver.java index 674a9a0faf..9060f4247c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/contextLifecycleEvent/ee/RequestContextLifecycleObserver.java @@ -31,7 +31,8 @@ public class RequestContextLifecycleObserver { private List initializedEvents = new CopyOnWriteArrayList<>(); private List destroyedEvents = new CopyOnWriteArrayList<>(); - public void firstInit(@Observes @Initialized(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION - 100) ServletRequest servletRequest) { + public void firstInit(@Observes @Initialized(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION + - 100) ServletRequest servletRequest) { initializedEvents.add("A"); } @@ -40,11 +41,13 @@ public void secondInit(@Observes @Initialized(RequestScoped.class) ServletReques ; } - public void thirdInit(@Observes @Initialized(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION + 501) ServletRequest servletRequest) { + public void thirdInit(@Observes @Initialized(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION + + 501) ServletRequest servletRequest) { initializedEvents.add("C"); } - public void firstDestroy(@Observes @Destroyed(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION) ServletRequest servletRequest) { + public void firstDestroy( + @Observes @Destroyed(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION) ServletRequest servletRequest) { destroyedEvents.add("A"); } @@ -52,7 +55,8 @@ public void secondDestroy(@Observes @Destroyed(RequestScoped.class) ServletReque destroyedEvents.add("B"); } - public void thirdDestroy(@Observes @Destroyed(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION + 501) ServletRequest servletRequest) { + public void thirdDestroy(@Observes @Destroyed(RequestScoped.class) @Priority(Interceptor.Priority.APPLICATION + + 501) ServletRequest servletRequest) { destroyedEvents.add("C"); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/OnlineAccountService.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/OnlineAccountService.java index e608bd8feb..876dc8d642 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/OnlineAccountService.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/OnlineAccountService.java @@ -23,8 +23,6 @@ import jakarta.transaction.Status; import jakarta.transaction.UserTransaction; -import org.jboss.cdi.tck.tests.event.observer.transactional.Failure; -import org.jboss.cdi.tck.tests.event.observer.transactional.Withdrawal; import org.jboss.cdi.tck.util.ActionSequence; @Named @@ -42,7 +40,7 @@ public class OnlineAccountService { Event eventFailure; /** - * + * * @param amount * @throws Exception */ @@ -54,7 +52,7 @@ public void withdrawSuccesTransaction(int amount) throws Exception { } /** - * + * * @param amount * @throws Exception */ @@ -67,7 +65,7 @@ public void withdrawFailedTransaction(int amount) throws Exception { } /** - * + * * @param amount * @throws Exception */ @@ -77,7 +75,7 @@ public void withdrawNoTransaction(int amount) throws Exception { } /** - * + * * @param amount * @throws Exception */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/PhisherAccountTransactionObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/PhisherAccountTransactionObserver.java index 08cc0b6b47..366add8141 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/PhisherAccountTransactionObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/PhisherAccountTransactionObserver.java @@ -22,83 +22,87 @@ import jakarta.transaction.UserTransaction; /** - * + * * @author Mark Paluch */ @Dependent -public class PhisherAccountTransactionObserver extends AbstractObserver{ - +public class PhisherAccountTransactionObserver extends AbstractObserver { @Resource private UserTransaction userTransaction; /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawAfterSuccess( - @Observes(during = TransactionPhase.AFTER_SUCCESS) @Priority(Interceptor.Priority.APPLICATION + 111) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.AFTER_SUCCESS) @Priority(Interceptor.Priority.APPLICATION + + 111) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.AFTER_SUCCESS); } /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawAfterCompletion( - @Observes(during = TransactionPhase.AFTER_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + 111) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.AFTER_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + + 111) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.AFTER_COMPLETION); } /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawBeforeCompletion( - @Observes(during = TransactionPhase.BEFORE_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + 700) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.BEFORE_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + + 700) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.BEFORE_COMPLETION); } /** * Always fire immediately. - * + * * @param txWithdrawal * @throws Exception */ public void withdrawNoTx( - @Observes(during = TransactionPhase.IN_PROGRESS) @Priority(Interceptor.Priority.APPLICATION + 700) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.IN_PROGRESS) @Priority(Interceptor.Priority.APPLICATION + + 700) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.IN_PROGRESS); } /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawAfterFailure( - @Observes(during = TransactionPhase.AFTER_FAILURE) @Priority(Interceptor.Priority.APPLICATION + 999) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.AFTER_FAILURE) @Priority(Interceptor.Priority.APPLICATION + + 999) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.AFTER_FAILURE); } /** - * + * * @param txFailure * @throws Exception */ public void failBeforeCompletion( - @Observes(during = TransactionPhase.IN_PROGRESS) @Priority(Interceptor.Priority.APPLICATION + 999) TxFailure txFailure) + @Observes(during = TransactionPhase.IN_PROGRESS) @Priority(Interceptor.Priority.APPLICATION + + 999) TxFailure txFailure) throws Exception { logEventFired(TransactionPhase.IN_PROGRESS); userTransaction.setRollbackOnly(); } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/ReceiverAccountTransactionObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/ReceiverAccountTransactionObserver.java index c6646e7b67..b07512d50d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/ReceiverAccountTransactionObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/ReceiverAccountTransactionObserver.java @@ -22,7 +22,7 @@ import jakarta.transaction.UserTransaction; /** - * + * * @author Mark Paluch */ @Dependent @@ -32,60 +32,66 @@ public class ReceiverAccountTransactionObserver extends AbstractObserver { private UserTransaction userTransaction; /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawAfterSuccess( - @Observes(during = TransactionPhase.AFTER_SUCCESS) @Priority(Interceptor.Priority.APPLICATION + 100) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.AFTER_SUCCESS) @Priority(Interceptor.Priority.APPLICATION + + 100) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.AFTER_SUCCESS); } /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawAfterCompletion( - @Observes(during = TransactionPhase.AFTER_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + 50) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.AFTER_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + + 50) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.AFTER_COMPLETION); } /** - * + * * @param txWithdrawal * @throws Exception */ - public void withdrawBeforeCompletion(@Observes(during = TransactionPhase.BEFORE_COMPLETION) @Priority(Interceptor.Priority.APPLICATION - 1) TxWithdrawal txWithdrawal) + public void withdrawBeforeCompletion( + @Observes(during = TransactionPhase.BEFORE_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + - 1) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.BEFORE_COMPLETION); } /** * Always fire immediately. - * + * * @param txWithdrawal * @throws Exception */ public void withdrawNoTx( - @Observes(during = TransactionPhase.IN_PROGRESS) @Priority(Interceptor.Priority.APPLICATION + 600) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.IN_PROGRESS) @Priority(Interceptor.Priority.APPLICATION + + 600) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.IN_PROGRESS); } /** - * + * * @param txWithdrawal * @throws Exception */ - public void withdrawAfterFailure(@Observes(during = TransactionPhase.AFTER_FAILURE) TxWithdrawal txWithdrawal) throws Exception { + public void withdrawAfterFailure(@Observes(during = TransactionPhase.AFTER_FAILURE) TxWithdrawal txWithdrawal) + throws Exception { logEventFired(TransactionPhase.AFTER_FAILURE); } /** - * + * * @param txFailure * @throws Exception */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/SenderAccountTransactionObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/SenderAccountTransactionObserver.java index 60b28edd84..d338c39483 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/SenderAccountTransactionObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/priority/transactional/SenderAccountTransactionObserver.java @@ -22,7 +22,7 @@ import jakarta.transaction.UserTransaction; /** - * + * * @author Mark Paluch */ @Dependent @@ -32,29 +32,31 @@ public class SenderAccountTransactionObserver extends AbstractObserver { private UserTransaction userTransaction; /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawAfterSuccess( - @Observes(during = TransactionPhase.AFTER_SUCCESS) @Priority(Interceptor.Priority.APPLICATION + 50) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.AFTER_SUCCESS) @Priority(Interceptor.Priority.APPLICATION + + 50) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.AFTER_SUCCESS); } /** - * + * * @param txWithdrawal * @throws Exception */ public void withdrawAfterCompletion( - @Observes(during = TransactionPhase.AFTER_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + 100) TxWithdrawal txWithdrawal) + @Observes(during = TransactionPhase.AFTER_COMPLETION) @Priority(Interceptor.Priority.APPLICATION + + 100) TxWithdrawal txWithdrawal) throws Exception { logEventFired(TransactionPhase.AFTER_COMPLETION); } /** - * + * * @param txWithdrawal * @throws Exception */ @@ -65,7 +67,7 @@ public void withdrawBeforeCompletion(@Observes(during = TransactionPhase.BEFORE_ /** * Always fire immediately. - * + * * @param txWithdrawal * @throws Exception */ @@ -74,16 +76,17 @@ public void withdrawNoTx(@Observes(during = TransactionPhase.IN_PROGRESS) TxWith } /** - * + * * @param txWithdrawal * @throws Exception */ - public void withdrawAfterFailure(@Observes(during = TransactionPhase.AFTER_FAILURE) TxWithdrawal txWithdrawal) throws Exception { + public void withdrawAfterFailure(@Observes(during = TransactionPhase.AFTER_FAILURE) TxWithdrawal txWithdrawal) + throws Exception { logEventFired(TransactionPhase.AFTER_FAILURE); } /** - * + * * @param txFailure * @throws Exception */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/EJBEvent.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/EJBEvent.java index 77a0836fb8..e0c067aae1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/EJBEvent.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/EJBEvent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/LocalInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/LocalInterface.java index 7cf45ef8f8..4de1ce325b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/LocalInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/LocalInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/NoInterfaceSLSB.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/NoInterfaceSLSB.java index 4a5e91e8ea..0eb8110352 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/NoInterfaceSLSB.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/NoInterfaceSLSB.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java index db2d90e1b2..5301665d60 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/ResolveEnterpriseEventObserverTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/Spitz.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/Spitz.java index 5a15f5acb2..642177a834 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/Spitz.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/resolve/enterprise/Spitz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountService.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountService.java index d75115d7bb..84f0b221be 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountService.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountService.java @@ -40,7 +40,7 @@ public class AccountService { Event eventFailure; /** - * + * * @param amount * @throws Exception */ @@ -52,7 +52,7 @@ public void withdrawSuccesTransaction(int amount) throws Exception { } /** - * + * * @param amount * @throws Exception */ @@ -65,7 +65,7 @@ public void withdrawFailedTransaction(int amount) throws Exception { } /** - * + * * @param amount * @throws Exception */ @@ -75,7 +75,7 @@ public void withdrawNoTransaction(int amount) throws Exception { } /** - * + * * @param amount * @throws Exception */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountTransactionObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountTransactionObserver.java index 9fa961a8e8..98a8bca361 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountTransactionObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/AccountTransactionObserver.java @@ -23,7 +23,7 @@ import org.jboss.cdi.tck.util.SimpleLogger; /** - * + * * @author Martin Kouba */ @Dependent @@ -35,16 +35,17 @@ public class AccountTransactionObserver { private UserTransaction userTransaction; /** - * + * * @param withdrawal * @throws Exception */ - public void withdrawAfterSuccess(@Observes(during = TransactionPhase.AFTER_SUCCESS) Withdrawal withdrawal) throws Exception { + public void withdrawAfterSuccess(@Observes(during = TransactionPhase.AFTER_SUCCESS) Withdrawal withdrawal) + throws Exception { logEventFired(TransactionPhase.AFTER_SUCCESS); } /** - * + * * @param withdrawal * @throws Exception */ @@ -54,7 +55,7 @@ public void withdrawAfterCompletion(@Observes(during = TransactionPhase.AFTER_CO } /** - * + * * @param withdrawal * @throws Exception */ @@ -65,7 +66,7 @@ public void withdrawBeforeCompletion(@Observes(during = TransactionPhase.BEFORE_ /** * Always fire immediately. - * + * * @param withdrawal * @throws Exception */ @@ -74,16 +75,17 @@ public void withdrawNoTx(@Observes(during = TransactionPhase.IN_PROGRESS) Withdr } /** - * + * * @param withdrawal * @throws Exception */ - public void withdrawAfterFailure(@Observes(during = TransactionPhase.AFTER_FAILURE) Withdrawal withdrawal) throws Exception { + public void withdrawAfterFailure(@Observes(during = TransactionPhase.AFTER_FAILURE) Withdrawal withdrawal) + throws Exception { logEventFired(TransactionPhase.AFTER_FAILURE); } /** - * + * * @param failure * @throws Exception */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/TransactionalObserverTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/TransactionalObserverTest.java index bb4e3980c6..c86b10b68c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/TransactionalObserverTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/TransactionalObserverTest.java @@ -55,9 +55,12 @@ public static WebArchive createTestArchive() { AccountService accountService; @Test - @SpecAssertions({ @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "a"), @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "b"), - @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "c"), @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "d"), - @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "e"), @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "gaa"), + @SpecAssertions({ @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "a"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "b"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "c"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "d"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "e"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "gaa"), @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "b") }) public void testSucessfullTransaction() throws Exception { @@ -81,9 +84,12 @@ public void testSucessfullTransaction() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "a"), @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "b"), - @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "c"), @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "d"), - @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "e"), @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "gaa"), + @SpecAssertions({ @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "a"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "b"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "c"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "d"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "e"), + @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "gaa"), @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "b") }) public void testFailedTransaction() throws Exception { @@ -109,7 +115,8 @@ public void testFailedTransaction() throws Exception { * @throws Exception */ @Test - @SpecAssertions({ @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "a"), @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = TRANSACTIONAL_OBSERVER_METHODS, id = "a"), + @SpecAssertion(section = OBSERVER_NOTIFICATION, id = "b") }) public void testNoTransaction() throws Exception { logger.log("testNoTransaction"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/Giraffe.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/Giraffe.java index f736b6e860..e5f24ee8ba 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/Giraffe.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/Giraffe.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeCustomObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeCustomObserver.java index 7b25c0ffff..3f67533580 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeCustomObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeCustomObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeObserver.java index b2b259da37..43f4480a4d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/GiraffeObserver.java @@ -27,16 +27,17 @@ public class GiraffeObserver { private static final SimpleLogger logger = new SimpleLogger(GiraffeObserver.class); /** - * + * * @param giraffe * @throws Exception */ - public void withdrawAfterCompletion(@Observes(during = TransactionPhase.AFTER_COMPLETION) Giraffe giraffe) throws Exception { + public void withdrawAfterCompletion(@Observes(during = TransactionPhase.AFTER_COMPLETION) Giraffe giraffe) + throws Exception { logEventFired(TransactionPhase.AFTER_COMPLETION); } /** - * + * * @param giraffe * @throws Exception */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/ObserverExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/ObserverExtension.java index 0d29907c3f..ce72bb4b97 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/ObserverExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/custom/ObserverExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/roolback/TransactionalObserverRollbackTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/roolback/TransactionalObserverRollbackTest.java index 0d88e684a4..c6cc01cbec 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/roolback/TransactionalObserverRollbackTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/event/observer/transactional/roolback/TransactionalObserverRollbackTest.java @@ -37,7 +37,7 @@ */ @Test(groups = { INTEGRATION }) @SpecVersion(spec = "cdi", version = "2.0") -public class TransactionalObserverRollbackTest extends AbstractTest{ +public class TransactionalObserverRollbackTest extends AbstractTest { @Inject EjbTestBean ejbTestBean; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/AlternativeMetadataTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/AlternativeMetadataTest.java index b48cfa8b1a..dade6540fa 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/AlternativeMetadataTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/AlternativeMetadataTest.java @@ -13,7 +13,11 @@ */ package org.jboss.cdi.tck.tests.extensions.alternative.metadata.ejb; +import static org.jboss.cdi.tck.cdi.Sections.ALTERNATIVE_METADATA_SOURCES_EE; +import static org.testng.Assert.assertEquals; + import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -25,10 +29,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.cdi.Sections.ALTERNATIVE_METADATA_SOURCES_EE; -import static org.testng.Assert.assertEquals; - - /** * This test class contains tests for adding meta data using extensions. * @@ -54,8 +54,7 @@ public static WebArchive createTestArchive() { @SpecAssertion(section = ALTERNATIVE_METADATA_SOURCES_EE, id = "kb") public void testGetTypeClosureUsedToDetermineTypeOfSessionBean() { Bean pasta = getBeans(Pasta.class).iterator().next(); - assertEquals(pasta.getTypes().size(), 2, ""+pasta.getTypes()); + assertEquals(pasta.getTypes().size(), 2, "" + pasta.getTypes()); } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/Pasta.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/Pasta.java index 1b7b4edf73..3a374593dc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/Pasta.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/Pasta.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.extensions.alternative.metadata.ejb; import jakarta.ejb.Stateless; + import org.jboss.cdi.tck.tests.full.extensions.alternative.metadata.ItalianFood; @Stateless diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/PastaWrapper.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/PastaWrapper.java index 57cb469e1b..0dbec946e4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/PastaWrapper.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/PastaWrapper.java @@ -13,13 +13,14 @@ */ package org.jboss.cdi.tck.tests.extensions.alternative.metadata.ejb; -import org.jboss.cdi.tck.util.annotated.AnnotatedTypeWrapper; - -import jakarta.enterprise.inject.spi.AnnotatedType; import java.lang.reflect.Type; import java.util.HashSet; import java.util.Set; +import jakarta.enterprise.inject.spi.AnnotatedType; + +import org.jboss.cdi.tck.util.annotated.AnnotatedTypeWrapper; + public class PastaWrapper extends AnnotatedTypeWrapper { private final Set typeClosure = new HashSet(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/ProcessAnnotatedTypeObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/ProcessAnnotatedTypeObserver.java index 87ec99eda2..0e5d721c32 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/ProcessAnnotatedTypeObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/alternative/metadata/ejb/ProcessAnnotatedTypeObserver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/EnterpriseWithAnnotationsTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/EnterpriseWithAnnotationsTest.java index 50d02e801b..e733353f94 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/EnterpriseWithAnnotationsTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/EnterpriseWithAnnotationsTest.java @@ -43,7 +43,7 @@ /** * @author Martin Kouba - * + * */ @Test(groups = INTEGRATION) @SpecVersion(spec = "cdi", version = "2.0") @@ -56,7 +56,8 @@ public static WebArchive createTestArchive() { .withTestClass(EnterpriseWithAnnotationsTest.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withClasses(Baby.class, Desired.class, ProcessAnnotatedTypeObserver.class, Hawk.class, Wanted.class, - Chicken.class, MetaAnnotation.class).withExtensions(ProcessAnnotatedTypeObserver.class).build(); + Chicken.class, MetaAnnotation.class) + .withExtensions(ProcessAnnotatedTypeObserver.class).build(); } @Inject @@ -77,7 +78,8 @@ public void testDelivery() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fc"), @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "g") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "fc"), + @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "g") }) public void testDeliveryMetaAnnotation() { List> processedTypes = processAnnotatedTypeObserver.getProcessedMetaAnnotationTypes(); assertFalse(processedTypes.isEmpty()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/Hawk.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/Hawk.java index fa01d8ffc4..b8d09bdbc4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/Hawk.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/annotated/delivery/ejb/Hawk.java @@ -16,6 +16,7 @@ import jakarta.ejb.Stateless; import jakarta.inject.Inject; + import org.jboss.cdi.tck.tests.full.extensions.annotated.delivery.Baby; import org.jboss.cdi.tck.tests.full.extensions.annotated.delivery.Chicken; import org.jboss.cdi.tck.tests.full.extensions.annotated.delivery.Desired; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/CreateBeanAttributesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/CreateBeanAttributesTest.java index 41a852d94f..d4f5f7b567 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/CreateBeanAttributesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/CreateBeanAttributesTest.java @@ -13,6 +13,14 @@ */ package org.jboss.cdi.tck.tests.extensions.beanManager.beanAttributes.ejb; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.BM_OBTAIN_BEANATTRIBUTES; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Any; @@ -23,6 +31,7 @@ import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.BeanAttributes; import jakarta.inject.Named; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -39,14 +48,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.BM_OBTAIN_BEANATTRIBUTES; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - /** *

    * This test was originally part of Weld test suite. @@ -62,11 +63,10 @@ public class CreateBeanAttributesTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(CreateBeanAttributesTest.class) .withClasses(Animal.class, Fish.class, InvalidBeanType.class, Landmark.class, Natural.class, - TundraStereotype.class, WaterBody.class,Wild.class) + TundraStereotype.class, WaterBody.class, Wild.class) .build(); } - @SuppressWarnings("unchecked") @Test(groups = INTEGRATION) @SpecAssertion(section = BM_OBTAIN_BEANATTRIBUTES, id = "a") @@ -127,7 +127,8 @@ public void testBeanAttributesForField() { if (field.getJavaMember().getName().equals("fish") && field.getJavaMember().getDeclaringClass().equals(Dam.class)) { damFishField = field; } - if (field.getJavaMember().getName().equals("fish") && field.getJavaMember().getDeclaringClass().equals(Lake.class)) { + if (field.getJavaMember().getName().equals("fish") + && field.getJavaMember().getDeclaringClass().equals(Lake.class)) { lakeFishField = field; } if (field.getJavaMember().getName().equals("volume") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Dam.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Dam.java index c286550f54..724605ff9f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Dam.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Dam.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Lake.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Lake.java index 1ed8cd5a34..9ea2b2b26f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Lake.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/Lake.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,6 +17,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Typed; import jakarta.inject.Named; + import org.jboss.cdi.tck.tests.full.extensions.beanManager.beanAttributes.Fish; import org.jboss.cdi.tck.tests.full.extensions.beanManager.beanAttributes.Natural; import org.jboss.cdi.tck.tests.full.extensions.beanManager.beanAttributes.TundraStereotype; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/LakeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/LakeLocal.java index aee53d1d89..3d03f5281d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/LakeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/beanManager/beanAttributes/ejb/LakeLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.extensions.beanManager.beanAttributes.ejb; import jakarta.ejb.Local; + import org.jboss.cdi.tck.tests.full.extensions.beanManager.beanAttributes.WaterBody; @Local diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cheese.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cheese.java index 383c8a2920..78bb994a8a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cheese.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cheese.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/ContainerEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/ContainerEventTest.java index af0a60bd67..706137f9e1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/ContainerEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/ContainerEventTest.java @@ -58,18 +58,21 @@ public static EnterpriseArchive createTestArchive() { .withTestClassPackage(ContainerEventTest.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withExtensions(ProcessBeanObserver.class, ProcessInjectionTargetObserver.class, - ProcessAnnotatedTypeObserver.class).withEjbJarXml("ejb-jar.xml").build(); + ProcessAnnotatedTypeObserver.class) + .withEjbJarXml("ejb-jar.xml").build(); } @Test - @SpecAssertions({ @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "f"), @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "aaa") }) + @SpecAssertions({ @SpecAssertion(section = BEAN_DISCOVERY_STEPS, id = "f"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "aaa") }) public void testProcessInjectionTargetFiredForManagedBean() { assert ProcessInjectionTargetObserver.getManagedBeanType() != null; validateManagedBean(ProcessInjectionTargetObserver.getManagedBeanType()); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aab"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abb"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aab"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abb"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "bb") }) public void testProcessInjectionTargetFiredForSessionBean() { assert ProcessInjectionTargetObserver.getStatelessSessionBeanType() != null; @@ -79,7 +82,8 @@ public void testProcessInjectionTargetFiredForSessionBean() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aaf"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abf"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aaf"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abf"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "bh") }) public void testProcessInjectionTargetFiredForSessionBeanInterceptor() { assert ProcessInjectionTargetObserver.getSessionBeanInterceptorType() != null; @@ -117,14 +121,16 @@ public void testProcessManagedBeanFired() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_EE, id = "ca"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "fb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_EE, id = "ca"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "fb") }) public void testProcessSessionBeanFiredForStatelessSessionBean() { assert ProcessBeanObserver.getProcessStatelessSessionBeanAnnotatedType() != null; validateStatelessSessionBean(ProcessBeanObserver.getProcessStatelessSessionBeanAnnotatedType()); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_EE, id = "ca"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "fb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_EE, id = "ca"), + @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "fb") }) public void testProcessSessionBeanFiredForStatefulSessionBean() { assert ProcessBeanObserver.getProcessStatefulSessionBeanAnnotatedType() != null; validateStatefulSessionBean(ProcessBeanObserver.getProcessStatefulSessionBeanAnnotatedType()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cow.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cow.java index d383301709..ca51fb7814 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cow.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Cow.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * This is a stateful session bean defined in ejb-jar.xml - * + * */ public class Cow implements CowLocal { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/CowLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/CowLocal.java index 31648e9195..b2ccfdc47d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/CowLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/CowLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,7 +15,7 @@ /** * This is a local interface for a session bean defined in ejb-jar.xml - * + * */ public interface CowLocal { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Farm.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Farm.java index e2495ea2b4..5a6dea67d4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Farm.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Food.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Food.java index 59aa32187f..1233cccd92 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Food.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Food.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Milk.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Milk.java index 16d001d54d..041c4579cc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Milk.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Milk.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Sheep.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Sheep.java index 218a403887..e240a8b003 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Sheep.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepInterceptor.java index d81b36e2f1..13e05330c0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepLocal.java index 89cbebf341..53d4092858 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/SheepLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Tame.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Tame.java index 438826ee69..ad997f0393 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Tame.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/ContainerEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/ContainerEventTest.java index d9e8596d13..fe4533cc01 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/ContainerEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/ContainerEventTest.java @@ -30,8 +30,8 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.impl.ConfigurationFactory; -import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.descriptors.ejb.EjbJarDescriptorBuilder; +import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.ejbjar31.EjbJarDescriptor; import org.jboss.test.audit.annotations.SpecAssertion; @@ -56,7 +56,8 @@ public static WebArchive createTestArchive() { newMessageDriven("TestQueue", QueueMessageDrivenBean.class.getName()) .addActivationConfigProperty("acknowledgeMode", "Auto-acknowledge") .addActivationConfigProperty("destinationType", "jakarta.jms.Queue") - .addActivationConfigProperty("destinationLookup", ConfigurationFactory.get().getTestJmsQueue())).build(); + .addActivationConfigProperty("destinationLookup", ConfigurationFactory.get().getTestJmsQueue())) + .build(); return new WebArchiveBuilder().withTestClassPackage(ContainerEventTest.class) .withEjbJarXml(ejbJarDescriptor) @@ -64,7 +65,8 @@ public static WebArchive createTestArchive() { } @Test(groups = { JAVAEE_FULL, JMS }) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aaba"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abba") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aaba"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abba") }) public void testProcessInjectionTargetEventFiredForMessageDrivenBean() { AnnotatedType annotatedType = ProcessInjectionTargetObserver.getMdbType(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/Sheep.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/Sheep.java index 0b9e8dd721..b2b12802fd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/Sheep.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/container/event/jms/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/IncrementingInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/IncrementingInterceptor.java index 24456e3fb4..085689d7c6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/IncrementingInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/IncrementingInterceptor.java @@ -19,7 +19,7 @@ /** * Interceptor that adds one to the result of a method - * + * * @author Stuart Douglas stuart@baileyroberts.com.au> */ @Incremented 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 24e5572cce..950b818d15 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 @@ -13,16 +13,17 @@ */ package org.jboss.cdi.tck.tests.extensions.interceptors; +import java.util.HashSet; +import java.util.Set; + import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; import jakarta.enterprise.inject.spi.Extension; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.enterprise.util.Nonbinding; -import java.util.HashSet; -import java.util.Set; + import org.jboss.cdi.tck.util.AddForwardingAnnotatedTypeAction; import org.jboss.cdi.tck.util.annotated.AnnotatedMethodWrapper; import org.jboss.cdi.tck.util.annotated.AnnotatedTypeWrapper; @@ -48,7 +49,8 @@ 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 Nonbinding.Literal())); + 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/extensions/interceptors/InterceptorExtensionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtensionTest.java index 90673ef1c3..69a042f86f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtensionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/InterceptorExtensionTest.java @@ -23,6 +23,7 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -35,11 +36,11 @@ /** * Tests that interceptors registered via the SPI work correctly. - * + * *

    * This test was originally part of Weld test suite. *

    - * + * * @author Stuart Douglas stuart@baileyroberts.com.au * @author Martin Kouba */ @@ -53,10 +54,12 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(InterceptorExtensionTest.class) .withClasses(Marathon.class, NumberSource.class, WordSource.class) - .withLibrary(SuffixingInterceptor.class, IncrementingInterceptor.class, LifecycleInterceptor.class, Suffixed.class, FullMarathon.class, Incremented.class, + .withLibrary(SuffixingInterceptor.class, IncrementingInterceptor.class, LifecycleInterceptor.class, + Suffixed.class, FullMarathon.class, Incremented.class, InterceptorExtension.class) .withBeansXml( - new BeansXml().interceptors(SuffixingInterceptor.class, IncrementingInterceptor.class, LifecycleInterceptor.class)) + new BeansXml().interceptors(SuffixingInterceptor.class, IncrementingInterceptor.class, + LifecycleInterceptor.class)) .build(); } @@ -65,7 +68,7 @@ public static WebArchive createTestArchive() { @Inject private NumberSource numberSource; - + @Inject private WordSource wordSource; @@ -92,7 +95,7 @@ public void testLifecycleInterceptor() { bean.destroy(marathon, creationalContext); assertTrue(LifecycleInterceptor.isPreDestroyCalled()); } - + @Test @SpecAssertions({ @SpecAssertion(section = INIT_EVENTS, id = "b"), @SpecAssertion(section = INIT_EVENTS, id = "bb"), @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "aea") }) @@ -101,5 +104,5 @@ public void testInterceptorAddedByAnnotatedType() { assertEquals(wordSource.getWordWithSuffix(), WordSource.wordWithSuffix); assertTrue(SuffixingInterceptor.isDoAroundCalled()); } - + } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/Suffixed.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/Suffixed.java index fc8ded504d..b39ecd2a51 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/Suffixed.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/Suffixed.java @@ -19,8 +19,8 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) -@Target(value = {ElementType.TYPE, ElementType.METHOD}) +@Target(value = { ElementType.TYPE, ElementType.METHOD }) public @interface Suffixed { - String value() default "ly"; + String value() default "ly"; } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/WordSource.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/WordSource.java index 0e07f7cc55..a11b36354c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/WordSource.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/interceptors/WordSource.java @@ -17,16 +17,16 @@ @Dependent public class WordSource { - + public static final String word = "awesome"; public static final String suffix = "ness"; public static final String wordWithSuffix = word + suffix; - + @Suffixed(suffix) public String getWordWithSuffix() { return word; } - + public String getWord() { return word; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ContainerLifeCycleEventRuntimeInvocationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ContainerLifeCycleEventRuntimeInvocationTest.java index 45a0f12a31..b40d7f0b97 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ContainerLifeCycleEventRuntimeInvocationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ContainerLifeCycleEventRuntimeInvocationTest.java @@ -53,7 +53,6 @@ import jakarta.enterprise.inject.spi.ProcessProducer; import jakarta.enterprise.inject.spi.ProcessProducerField; import jakarta.enterprise.inject.spi.ProcessProducerMethod; -import jakarta.enterprise.inject.spi.ProcessSessionBean; import jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType; import jakarta.enterprise.inject.spi.Producer; import jakarta.inject.Inject; @@ -91,7 +90,7 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({@SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "f") }) public void testBeforeBeanDiscoveryEventFails() { final BeforeBeanDiscovery event = extension.getBeforeBeanDiscovery(); final AnnotatedType type = beanManager.createAnnotatedType(ContainerLifeCycleEventRuntimeInvocationTest.class); @@ -143,11 +142,10 @@ void execute() { } }.run(); - } @Test - @SpecAssertions({@SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "j")}) + @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "j") }) public void testAfterTypeDiscoveryEventFails() { final AfterTypeDiscovery event = extension.getAfterTypeDiscovery(); @@ -180,7 +178,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "j")}) + @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "j") }) public void testAfterBeanDiscoveryEventFails() { final AfterBeanDiscovery event = extension.getAfterBeanDiscovery(); @@ -227,7 +225,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = AFTER_DEPLOYMENT_VALIDATION, id = "e")}) + @SpecAssertions({ @SpecAssertion(section = AFTER_DEPLOYMENT_VALIDATION, id = "e") }) public void testAfterDeploymentValidationEventFails() { final AfterDeploymentValidation event = extension.getAfterDeploymentValidation(); new Invocation() { @@ -238,7 +236,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f") }) public void testProcessAnnotatedTypeEventFails() { final ProcessAnnotatedType event = extension.getProcessAnnotatedType(); final AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -268,7 +266,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f") }) public void testProcessSyntheticAnnotatedTypeEventFails() { final ProcessSyntheticAnnotatedType event = extension.getProcessSyntheticAnnotatedType(); final AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -304,7 +302,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessBeanEventFails() { final ProcessBean event = extension.getProcessBean(); new Invocation() { @@ -328,7 +326,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessManagedBeanEventFails() { final ProcessManagedBean event = extension.getProcessManagedBean(); new Invocation() { @@ -358,7 +356,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessProducerMethodEventFails() { final ProcessProducerMethod event = extension.getProcessProducerMethod(); new Invocation() { @@ -394,7 +392,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessProducerFieldEventFails() { final ProcessProducerField event = extension.getProcessProducerField(); new Invocation() { @@ -430,11 +428,11 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "f") }) public void testProcessBeanAttributesEventFails() { final ProcessBeanAttributes event = extension.getProcessBeanAttributes(); AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); - final BeanAttributes attributes = beanManager.createBeanAttributes(type); + final BeanAttributes attributes = beanManager.createBeanAttributes(type); new Invocation() { void execute() { event.addDefinitionError(new NullPointerException()); @@ -468,7 +466,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "dc")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "dc") }) public void testProcessObserverMethodEventFails() { final ProcessObserverMethod event = extension.getProcessObserverMethod(); new Invocation() { @@ -494,7 +492,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "g")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "g") }) public void testProcessInjectionTargetEventFails() { final ProcessInjectionTarget event = extension.getProcessInjectionTarget(); AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -523,7 +521,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_INJECTION_POINT, id = "e")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "e") }) public void testProcessInjectionPointEventFails() { final ProcessInjectionPoint event = extension.getProcessInjectionPoint(); AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -553,7 +551,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_PRODUCER, id = "i")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "i") }) public void testProcessProducer() { final ProcessProducer event = extension.getProcessProducer(); new Invocation() { @@ -604,5 +602,4 @@ void run() { abstract void execute(); } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/SimpleBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/SimpleBean.java index 9ee324b00b..04fa9f2647 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/SimpleBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/SimpleBean.java @@ -28,15 +28,13 @@ public class SimpleBean { @Produces public Integer numberOfNumbers = new Integer(13); - @Produces - public Integer create(){ + public Integer create() { return new Integer(0); } - // we need some observer for this bean just for test purposes - public void dummyObserver(@Observes SimpleBean bean){ + public void dummyObserver(@Observes SimpleBean bean) { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/TestExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/TestExtension.java index 245dde9c44..cca61d5a18 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/TestExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/TestExtension.java @@ -32,7 +32,6 @@ import jakarta.enterprise.inject.spi.ProcessProducer; import jakarta.enterprise.inject.spi.ProcessProducerField; import jakarta.enterprise.inject.spi.ProcessProducerMethod; -import jakarta.enterprise.inject.spi.ProcessSessionBean; import jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType; public class TestExtension implements Extension { @@ -50,12 +49,13 @@ public class TestExtension implements Extension { private ProcessInjectionPoint pip; private ProcessProducer pp; private ProcessManagedBean pmb; - private ProcessProducerField ppf; - private ProcessProducerMethod ppm; + private ProcessProducerField ppf; + private ProcessProducerMethod ppm; void observesBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager bm) { this.bbd = event; - bbd.addAnnotatedType(bm.createAnnotatedType(SimpleBean.class), TestExtension.class.getName() + ":" + SimpleBean.class.getName()); + bbd.addAnnotatedType(bm.createAnnotatedType(SimpleBean.class), + TestExtension.class.getName() + ":" + SimpleBean.class.getName()); } void observesProcessAnnotatedType(@Observes ProcessAnnotatedType event) { @@ -110,11 +110,11 @@ void observesProcessManagedBean(@Observes ProcessManagedBean event) this.pmb = event; } - void observesProcessProducerField(@Observes ProcessProducerField event) { + void observesProcessProducerField(@Observes ProcessProducerField event) { this.ppf = event; } - void observesProcessSessionBean(@Observes ProcessProducerMethod event) { + void observesProcessSessionBean(@Observes ProcessProducerMethod event) { this.ppm = event; } @@ -182,11 +182,11 @@ public ProcessManagedBean getProcessManagedBean() { return pmb; } - public ProcessProducerField getProcessProducerField() { + public ProcessProducerField getProcessProducerField() { return ppf; } - public ProcessProducerMethod getProcessProducerMethod() { + public ProcessProducerMethod getProcessProducerMethod() { return ppm; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/ContainerLifeCycleEventRuntimeInvocationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/ContainerLifeCycleEventRuntimeInvocationTest.java index bfc9fe5db3..d726393024 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/ContainerLifeCycleEventRuntimeInvocationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/ContainerLifeCycleEventRuntimeInvocationTest.java @@ -13,6 +13,21 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.events.ejb; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; +import static org.jboss.cdi.tck.cdi.Sections.AFTER_BEAN_DISCOVERY; +import static org.jboss.cdi.tck.cdi.Sections.AFTER_DEPLOYMENT_VALIDATION; +import static org.jboss.cdi.tck.cdi.Sections.AFTER_TYPE_DISCOVERY; +import static org.jboss.cdi.tck.cdi.Sections.BEFORE_BEAN_DISCOVERY; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_ANNOTATED_TYPE; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN_ATTRIBUTES; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_INJECTION_POINT; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_INJECTION_TARGET; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_OBSERVER_METHOD; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_PRODUCER; +import static org.testng.Assert.fail; + import java.lang.annotation.Annotation; import java.util.Collections; import java.util.Set; @@ -43,6 +58,7 @@ import jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType; import jakarta.enterprise.inject.spi.Producer; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -52,21 +68,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; -import static org.jboss.cdi.tck.cdi.Sections.AFTER_BEAN_DISCOVERY; -import static org.jboss.cdi.tck.cdi.Sections.AFTER_DEPLOYMENT_VALIDATION; -import static org.jboss.cdi.tck.cdi.Sections.AFTER_TYPE_DISCOVERY; -import static org.jboss.cdi.tck.cdi.Sections.BEFORE_BEAN_DISCOVERY; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_ANNOTATED_TYPE; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN_ATTRIBUTES; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_INJECTION_POINT; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_INJECTION_TARGET; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_OBSERVER_METHOD; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_PRODUCER; -import static org.testng.Assert.fail; - /** * This test was originally part of the Weld test suite. * @@ -86,12 +87,13 @@ public class ContainerLifeCycleEventRuntimeInvocationTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(ContainerLifeCycleEventRuntimeInvocationTest.class) - .withClasses(TestExtension.class, SimpleAnnotation.class, SimpleBean.class, SessionBean.class).withExtension(TestExtension.class) + .withClasses(TestExtension.class, SimpleAnnotation.class, SimpleBean.class, SessionBean.class) + .withExtension(TestExtension.class) .build(); } @Test - @SpecAssertions({@SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "f") }) public void testBeforeBeanDiscoveryEventFails() { final BeforeBeanDiscovery event = extension.getBeforeBeanDiscovery(); final AnnotatedType type = beanManager.createAnnotatedType(ContainerLifeCycleEventRuntimeInvocationTest.class); @@ -143,11 +145,10 @@ void execute() { } }.run(); - } @Test - @SpecAssertions({@SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "j")}) + @SpecAssertions({ @SpecAssertion(section = AFTER_TYPE_DISCOVERY, id = "j") }) public void testAfterTypeDiscoveryEventFails() { final AfterTypeDiscovery event = extension.getAfterTypeDiscovery(); @@ -180,7 +181,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "j")}) + @SpecAssertions({ @SpecAssertion(section = AFTER_BEAN_DISCOVERY, id = "j") }) public void testAfterBeanDiscoveryEventFails() { final AfterBeanDiscovery event = extension.getAfterBeanDiscovery(); @@ -227,7 +228,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = AFTER_DEPLOYMENT_VALIDATION, id = "e")}) + @SpecAssertions({ @SpecAssertion(section = AFTER_DEPLOYMENT_VALIDATION, id = "e") }) public void testAfterDeploymentValidationEventFails() { final AfterDeploymentValidation event = extension.getAfterDeploymentValidation(); new Invocation() { @@ -238,7 +239,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f") }) public void testProcessAnnotatedTypeEventFails() { final ProcessAnnotatedType event = extension.getProcessAnnotatedType(); final AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -268,7 +269,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_ANNOTATED_TYPE, id = "f") }) public void testProcessSyntheticAnnotatedTypeEventFails() { final ProcessSyntheticAnnotatedType event = extension.getProcessSyntheticAnnotatedType(); final AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -304,7 +305,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessBeanEventFails() { final ProcessBean event = extension.getProcessBean(); new Invocation() { @@ -328,7 +329,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessManagedBeanEventFails() { final ProcessManagedBean event = extension.getProcessManagedBean(); new Invocation() { @@ -358,7 +359,7 @@ void execute() { } @Test(groups = { JAVAEE_FULL }) - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessSessionBeanEventFails() { final ProcessSessionBean event = extension.getProcessSessionBean(); new Invocation() { @@ -400,7 +401,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessProducerMethodEventFails() { final ProcessProducerMethod event = extension.getProcessProducerMethod(); new Invocation() { @@ -436,7 +437,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN, id = "o")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN, id = "o") }) public void testProcessProducerFieldEventFails() { final ProcessProducerField event = extension.getProcessProducerField(); new Invocation() { @@ -472,11 +473,11 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "f")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "f") }) public void testProcessBeanAttributesEventFails() { final ProcessBeanAttributes event = extension.getProcessBeanAttributes(); AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); - final BeanAttributes attributes = beanManager.createBeanAttributes(type); + final BeanAttributes attributes = beanManager.createBeanAttributes(type); new Invocation() { void execute() { event.addDefinitionError(new NullPointerException()); @@ -510,7 +511,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "dc")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_OBSERVER_METHOD, id = "dc") }) public void testProcessObserverMethodEventFails() { final ProcessObserverMethod event = extension.getProcessObserverMethod(); new Invocation() { @@ -536,7 +537,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "g")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET, id = "g") }) public void testProcessInjectionTargetEventFails() { final ProcessInjectionTarget event = extension.getProcessInjectionTarget(); AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -565,7 +566,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_INJECTION_POINT, id = "e")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT, id = "e") }) public void testProcessInjectionPointEventFails() { final ProcessInjectionPoint event = extension.getProcessInjectionPoint(); AnnotatedType type = beanManager.createAnnotatedType(SimpleBean.class); @@ -595,7 +596,7 @@ void execute() { } @Test - @SpecAssertions({@SpecAssertion(section = PROCESS_PRODUCER, id = "i")}) + @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "i") }) public void testProcessProducer() { final ProcessProducer event = extension.getProcessProducer(); new Invocation() { @@ -646,5 +647,4 @@ void run() { abstract void execute(); } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/SimpleBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/SimpleBean.java index 8bf5753bc6..24e6979b7a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/SimpleBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/SimpleBean.java @@ -28,15 +28,13 @@ public class SimpleBean { @Produces public Integer numberOfNumbers = new Integer(13); - @Produces - public Integer create(){ + public Integer create() { return new Integer(0); } - // we need some observer for this bean just for test purposes - public void dummyObserver(@Observes SimpleBean bean){ + public void dummyObserver(@Observes SimpleBean bean) { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/TestExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/TestExtension.java index f8213a8a3a..2b6344be0a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/TestExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/events/ejb/TestExtension.java @@ -13,6 +13,8 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.events.ejb; +import static org.testng.Assert.fail; + import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.AfterBeanDiscovery; import jakarta.enterprise.inject.spi.AfterDeploymentValidation; @@ -33,8 +35,6 @@ import jakarta.enterprise.inject.spi.ProcessSessionBean; import jakarta.enterprise.inject.spi.ProcessSyntheticAnnotatedType; -import static org.testng.Assert.fail; - public class TestExtension implements Extension { private BeforeBeanDiscovery bbd; @@ -56,7 +56,8 @@ public class TestExtension implements Extension { void observesBeforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager bm) { this.bbd = event; - bbd.addAnnotatedType(bm.createAnnotatedType(SimpleBean.class), TestExtension.class.getName() + ":" + SimpleBean.class.getName()); + bbd.addAnnotatedType(bm.createAnnotatedType(SimpleBean.class), + TestExtension.class.getName() + ":" + SimpleBean.class.getName()); } void observesProcessAnnotatedType(@Observes ProcessAnnotatedType event) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/builtin/ProcessBeanAttributesObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/builtin/ProcessBeanAttributesObserver.java index 02bd6386bd..157469d107 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/builtin/ProcessBeanAttributesObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/builtin/ProcessBeanAttributesObserver.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.builtin; +import java.util.ArrayList; +import java.util.List; + import jakarta.enterprise.context.Conversation; import jakarta.enterprise.event.Event; import jakarta.enterprise.event.Observes; @@ -23,9 +26,6 @@ import jakarta.enterprise.inject.spi.ProcessBeanAttributes; import jakarta.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; - public class ProcessBeanAttributesObserver implements Extension { private List> observedBeanAttributes = new ArrayList>(); @@ -66,4 +66,4 @@ public List> getObservedBeanAttributes() { return observedBeanAttributes; } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/Delta.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/Delta.java index 5172c18383..107e72ac53 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/Delta.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/Delta.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,6 +16,7 @@ import jakarta.ejb.Stateless; import jakarta.inject.Inject; import jakarta.inject.Named; + import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processBeanAttributes.Alpha; @Named diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyValuesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyValuesTest.java index a9ba2ec909..88ecad999f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyValuesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyValuesTest.java @@ -13,6 +13,14 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processBeanAttributes.ejb; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN_ATTRIBUTES; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN_ATTRIBUTES_EE; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + import java.lang.annotation.Annotation; import jakarta.decorator.Decorator; @@ -25,6 +33,7 @@ import jakarta.enterprise.inject.spi.BeanAttributes; import jakarta.inject.Inject; import jakarta.inject.Named; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -45,14 +54,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN_ATTRIBUTES; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_BEAN_ATTRIBUTES_EE; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - /** * This test was originally part of Weld test suite. * @@ -71,16 +72,15 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassPackage(VerifyValuesTest.class) .withClasses(Alpha.class, Bravo.class, BravoDecorator.class, BravoInterceptor.class, BravoInterface.class, - BravoProducer.class, BravoQualifier.class, CharlieInterface.class, CharlieProducer.class) + BravoProducer.class, BravoQualifier.class, CharlieInterface.class, CharlieProducer.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL) - .alternatives(Alpha.class, BravoProducer.class, CharlieProducer.class) - .interceptors(BravoInterceptor.class) - .decorators(BravoDecorator.class) + .alternatives(Alpha.class, BravoProducer.class, CharlieProducer.class) + .interceptors(BravoInterceptor.class) + .decorators(BravoDecorator.class) ) .withExtension(VerifyingExtension.class).build(); } - @Test @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES_EE, id = "bab") }) public void testSessionBeanAnnotated() { @@ -96,7 +96,8 @@ public void testSessionBeanAnnotated() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES_EE, id = "bab"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "aa"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES_EE, id = "bab"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) public void testSessionBeanAttributes() { BeanAttributes deltaAttributes = extension.getDeltaAttributes(); @@ -121,9 +122,9 @@ public void testProducerMethodAnnotated() { assertEquals(bravoAnnotatedMethod.getJavaMember().getName(), "createBravo"); } - @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ab"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ab"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) public void testInterceptorBeanAttributes() { BeanAttributes attributes = extension.getBravoInterceptorAttributes(); assertNotNull(attributes); @@ -135,7 +136,8 @@ public void testInterceptorBeanAttributes() { } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ac"), @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "ac"), + @SpecAssertion(section = PROCESS_BEAN_ATTRIBUTES, id = "bb") }) public void testDecoratorBeanAttributes() { BeanAttributes attributes = extension.getBravoDecoratorAttributes(); assertNotNull(attributes); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyingExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyingExtension.java index 369555a0a2..596e502b54 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyingExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processBeanAttributes/ejb/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,6 +22,7 @@ import jakarta.enterprise.inject.spi.BeanAttributes; import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.ProcessBeanAttributes; + import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processBeanAttributes.Bravo; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processBeanAttributes.BravoDecorator; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processBeanAttributes.BravoInterceptor; @@ -73,7 +74,6 @@ public BeanAttributes getBravoDecoratorAttributes() { return bravoDecoratorAttributes; } - public BeanAttributes getDeltaAttributes() { return deltaAttributes; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/ProcessInjectionPointFiredTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/ProcessInjectionPointFiredTest.java index 89c743d844..815d1b0a83 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/ProcessInjectionPointFiredTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/ProcessInjectionPointFiredTest.java @@ -13,22 +13,29 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionPoint.ee; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.PROCESS_INJECTION_POINT_EE; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Arrays; import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; +import org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget.Farm; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Alpha; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Bravo; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.BravoObserver; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Charlie; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Delta; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.InjectingBean; -import org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget.Farm; import org.jboss.cdi.tck.util.HierarchyDiscovery; import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -38,12 +45,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.PROCESS_INJECTION_POINT_EE; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - /** * This test was originally part of Weld test suite. * @@ -56,7 +57,8 @@ public class ProcessInjectionPointFiredTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(ProcessInjectionPointFiredTest.class) - .withClasses(Alpha.class, Bravo.class, BravoObserver.class, Charlie.class, Delta.class, InjectingBean.class, Farm.class) + .withClasses(Alpha.class, Bravo.class, BravoObserver.class, Charlie.class, Delta.class, InjectingBean.class, + Farm.class) .withBeansXml(new BeansXml(BeanDiscoveryMode.ALL)) .withWebResource("faces-config.xml", "/WEB-INF/faces-config.xml") .withExtension(VerifyingExtension.class).build(); @@ -65,8 +67,6 @@ public static WebArchive createTestArchive() { @Inject private VerifyingExtension extension; - - @Test(groups = INTEGRATION) @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_POINT_EE, id = "a") }) public void testJavaEEComponentInjectionPoint() { @@ -81,7 +81,6 @@ public void testJavaEEComponentInjectionPoint() { verifyType(listenerIp, Charlie.class); } - private static void verifyType(InjectionPoint ip, Class rawType, Class... typeParameters) { assertEquals(getRawType(ip.getType()), rawType); if (typeParameters.length > 0) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestFilter.java index b2170d19f2..3ab7d2fa2c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestFilter.java @@ -24,6 +24,7 @@ import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.annotation.WebFilter; + import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Charlie; @Vetoed diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestListener.java index 102822a87d..27e254133c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestListener.java @@ -18,6 +18,7 @@ import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextListener; import jakarta.servlet.annotation.WebListener; + import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Charlie; @Vetoed diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestServlet.java index 36da32001f..1f1ab83805 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/TestServlet.java @@ -17,6 +17,7 @@ import jakarta.inject.Inject; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; + import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Charlie; @SuppressWarnings("serial") @@ -26,5 +27,4 @@ public class TestServlet extends HttpServlet { @Inject Charlie charlie; - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/VerifyingExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/VerifyingExtension.java index be9e098cc3..fe047a69e8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/VerifyingExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionPoint/ee/VerifyingExtension.java @@ -13,12 +13,15 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionPoint.ee; +import static org.testng.Assert.assertNull; + import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.ProcessInjectionPoint; import jakarta.enterprise.inject.spi.ProcessManagedBean; + import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Alpha; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Bravo; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.BravoObserver; @@ -26,8 +29,6 @@ import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.Delta; import org.jboss.cdi.tck.tests.full.extensions.lifecycle.processInjectionPoint.InjectingBean; -import static org.testng.Assert.assertNull; - public class VerifyingExtension implements Extension { private InjectionPoint alpha; @@ -155,5 +156,4 @@ public InjectionPoint getDisposerDeltaIp() { return disposerDeltaIp; } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ContainerEventTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ContainerEventTest.java index 4abe9b60cf..aea90c06c9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ContainerEventTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ContainerEventTest.java @@ -47,49 +47,56 @@ public static WebArchive createTestArchive() { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aac"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abc"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aac"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abc"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "bd") }) public void testProcessInjectionTargetEventFiredForJsfManagedBean() { assertNotNull(ProcessInjectionTargetObserver.getJsfManagedBeanEvent()); } - + @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aac"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abc"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aac"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abc"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "be") }) public void testProcessInjectionTargetEventFiredForServletListener() { assertNotNull(ProcessInjectionTargetObserver.getListenerEvent()); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aad"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abd"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aad"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abd"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "bf") }) public void testProcessInjectionTargetEventFiredForTagHandler() { assertNotNull(ProcessInjectionTargetObserver.getTagHandlerEvent()); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aae"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abe"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aae"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abe"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "bg") }) public void testProcessInjectionTargetEventFiredForTagLibraryListener() { assertNotNull(ProcessInjectionTargetObserver.getTagLibraryListenerEvent()); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aah"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abh"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aah"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abh"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "bj") }) public void testProcessInjectionTargetEventFiredForServlet() { assertNotNull(ProcessInjectionTargetObserver.getServletEvent()); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aai"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abi"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aai"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "abi"), @SpecAssertion(section = BEAN_DISCOVERY_STEPS_EE, id = "bk") }) public void testProcessInjectionTargetEventFiredForFilter() { assertNotNull(ProcessInjectionTargetObserver.getFilterEvent()); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aas"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aao"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aas"), + @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aao"), @SpecAssertion(section = PROCESS_INJECTION_TARGET_EE, id = "aan") }) public void testTypeOfProcessInjectionTargetParameter() { assertFalse(ProcessInjectionTargetObserver.isStringObserved()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/CustomInjectionTarget.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/CustomInjectionTarget.java index 279d86a0cc..a7f22cc1b0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/CustomInjectionTarget.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/CustomInjectionTarget.java @@ -13,10 +13,11 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget; +import java.util.Set; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.InjectionPoint; import jakarta.enterprise.inject.spi.InjectionTarget; -import java.util.Set; public class CustomInjectionTarget implements InjectionTarget { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Farm.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Farm.java index a3a87b9c18..b81505f5ae 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Farm.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Fence.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Fence.java index 46a42ed510..7c574dd691 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Fence.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Fence.java @@ -26,7 +26,7 @@ public class Fence { private static boolean isWrappedInjectionSuccessfull = false; - public void ping(){ + public void ping() { } public static boolean isIsWrappedInjectionSuccessfull() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/FenceInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/FenceInterceptor.java index e77df8a508..b9b61e6e29 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/FenceInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/FenceInterceptor.java @@ -21,7 +21,8 @@ public class FenceInterceptor implements Serializable { - @Inject Sheep sheep; + @Inject + Sheep sheep; private static boolean isWrappedInjectionSuccessfull = false; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ProcessInjectionTargetObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ProcessInjectionTargetObserver.java index 4c23042ab7..5b42f324eb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ProcessInjectionTargetObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/ProcessInjectionTargetObserver.java @@ -44,27 +44,32 @@ public void observeJsfManagedBean(@Observes ProcessInjectionTarget event, public void observeServlet(@Observes ProcessInjectionTarget event, BeanManager beanManager) { servletEvent = event; - event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), () -> TestServlet.setIsWrappedInjectionSuccessfull(true))); + event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), + () -> TestServlet.setIsWrappedInjectionSuccessfull(true))); } public void observeFilter(@Observes ProcessInjectionTarget event, BeanManager beanManager) { filterEvent = event; - event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), () -> TestFilter.setIsWrappedInjectionSuccessfull(true))); + event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), + () -> TestFilter.setIsWrappedInjectionSuccessfull(true))); } public void observeListener(@Observes ProcessInjectionTarget event, BeanManager beanManager) { listenerEvent = event; - event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), () -> TestListener.setIsWrappedInjectionSuccessfull(true))); + event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), + () -> TestListener.setIsWrappedInjectionSuccessfull(true))); } public void observeTagHandler(@Observes ProcessInjectionTarget event, BeanManager beanManager) { tagHandlerEvent = event; - event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), () -> TestTagHandler.setIsWrappedInjectionSuccessfull(true))); + event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), + () -> TestTagHandler.setIsWrappedInjectionSuccessfull(true))); } public void observeTagLibraryListener(@Observes ProcessInjectionTarget event, BeanManager beanManager) { tagLibraryListenerEvent = event; - event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), () -> TagLibraryListener.setIsWrappedInjectionSuccessfull(true))); + event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), + () -> TagLibraryListener.setIsWrappedInjectionSuccessfull(true))); } public void observeServletSuperType(@Observes ProcessInjectionTarget event) { @@ -89,11 +94,13 @@ public void tagHandlerSubType(@Observes ProcessInjectionTarget event, BeanManager beanManager) { - event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), () -> Fence.setIsWrappedInjectionSuccessfull(true))); + event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), + () -> Fence.setIsWrappedInjectionSuccessfull(true))); } public void observeEJBInterceptor(@Observes ProcessInjectionTarget event, BeanManager beanManager) { - event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), () -> FenceInterceptor.setIsWrappedInjectionSuccessfull(true))); + event.setInjectionTarget(new CustomInjectionTarget(event.getInjectionTarget(), + () -> FenceInterceptor.setIsWrappedInjectionSuccessfull(true))); } public void stringObserver(@Observes ProcessInjectionTarget event) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Sheep.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Sheep.java index 7c9a3ec224..9509330341 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Sheep.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/Sheep.java @@ -6,17 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget; -import jakarta.enterprise.context.Dependent; - import java.io.Serializable; +import jakarta.enterprise.context.Dependent; + @Dependent public class Sheep implements Serializable { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestFilter.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestFilter.java index 34792c0156..f7a4344976 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestFilter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestFilter.java @@ -14,7 +14,6 @@ package org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget; import java.io.IOException; -import java.io.PrintWriter; import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; @@ -45,7 +44,7 @@ public void destroy() { public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - chain.doFilter(request,response); + chain.doFilter(request, response); } public void init(FilterConfig filterConfig) throws ServletException { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestListener.java index e2fda71c73..625492646b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestListener.java @@ -32,7 +32,7 @@ public void contextDestroyed(ServletContextEvent sce) { } public void contextInitialized(ServletContextEvent sce) { - sce.getServletContext().setAttribute("initialized",sheep); + sce.getServletContext().setAttribute("initialized", sheep); } public static boolean isIsWrappedInjectionSuccessfull() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestServlet.java index d8d1401f05..c0381aa82d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestServlet.java @@ -13,6 +13,9 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget; +import java.io.IOException; +import java.io.PrintWriter; + import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; import jakarta.servlet.ServletException; @@ -20,8 +23,6 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; @Vetoed @WebServlet("/test") @@ -67,7 +68,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se writer.append(String.valueOf(TagLibraryListener.isIsWrappedInjectionSuccessfull())); } - writer.append("\n"+req.getServletContext().getAttribute("initialized").toString() + "\n"); + writer.append("\n" + req.getServletContext().getAttribute("initialized").toString() + "\n"); } public static void setIsWrappedInjectionSuccessfull(boolean isWrappedInjectionSuccessfull) { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestTagHandler.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestTagHandler.java index a63fb1abd2..5f3fa8e324 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestTagHandler.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/lifecycle/processInjectionTarget/TestTagHandler.java @@ -13,10 +13,11 @@ */ package org.jboss.cdi.tck.tests.extensions.lifecycle.processInjectionTarget; +import java.io.IOException; + import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; import jakarta.servlet.jsp.tagext.SimpleTagSupport; -import java.io.IOException; @Vetoed public class TestTagHandler extends SimpleTagSupport { @@ -32,7 +33,7 @@ public void initialize(Sheep sheep) { @Override public void doTag() throws IOException { - getJspContext().getOut().write(String.valueOf(isWrappedInjectionSuccessfull)); + getJspContext().getOut().write(String.valueOf(isWrappedInjectionSuccessfull)); } public static boolean isIsWrappedInjectionSuccessfull() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/Elephant.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/Elephant.java index 363ecc6c06..5551e521a7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/Elephant.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/Elephant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ElephantLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ElephantLocal.java index bcbd0fd3ef..fb82a0984d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ElephantLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ElephantLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ProcessSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ProcessSessionBeanTest.java index 6ce63f9423..f508f80f52 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ProcessSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/processBean/ejb/ProcessSessionBeanTest.java @@ -51,7 +51,8 @@ public static WebArchive createTestArchive() { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_EE, id = "ca"), @SpecAssertion(section = PROCESS_BEAN_EE, id = "cb"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_BEAN_EE, id = "ca"), + @SpecAssertion(section = PROCESS_BEAN_EE, id = "cb"), @SpecAssertion(section = PROCESS_BEAN_EE, id = "edb"), @SpecAssertion(section = PROCESS_BEAN_EE, id = "efb"), @SpecAssertion(section = PROCESS_BEAN_EE, id = "fb"), @SpecAssertion(section = PROCESS_BEAN_EE, id = "hb"), @SpecAssertion(section = PROCESS_BEAN_EE, id = "hc"), @SpecAssertion(section = PROCESS_BEAN_EE, id = "m"), diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ProducerProcessor.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ProducerProcessor.java index a436c13022..1b3c9c7d52 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ProducerProcessor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ProducerProcessor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/RemoteProducerTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/RemoteProducerTest.java index 3c649859be..d7253ef267 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/RemoteProducerTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/RemoteProducerTest.java @@ -40,11 +40,13 @@ public class RemoteProducerTest extends AbstractTest { @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withTestClassPackage(RemoteProducerTest.class).withExtension(ProducerProcessor.class).build(); + return new WebArchiveBuilder().withTestClassPackage(RemoteProducerTest.class).withExtension(ProducerProcessor.class) + .build(); } @Test - @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "ac"), @SpecAssertion(section = PROCESS_PRODUCER, id = "e"), + @SpecAssertions({ @SpecAssertion(section = PROCESS_PRODUCER, id = "ac"), + @SpecAssertion(section = PROCESS_PRODUCER, id = "e"), @SpecAssertion(section = PROCESS_PRODUCER, id = "gb") }) public void testProduceCallsOverridenResourceProducerMethod() { assertEquals(getContextualReference(ServiceRemote.class).ping(), "pong"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceBean.java index f2514b7f96..34403ec2e9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceProducer.java index 078eebc19d..852d2333ed 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceRemote.java index bd5186456b..6a438eedfa 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/producer/remote/ServiceRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/AnotherManualBeanRegistrationExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/AnotherManualBeanRegistrationExtension.java index 1587feb83b..56db2ac62a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/AnotherManualBeanRegistrationExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/AnotherManualBeanRegistrationExtension.java @@ -24,7 +24,7 @@ /** * An extension which registers a bean programmatically. - * + * * @author Dan Allen */ public class AnotherManualBeanRegistrationExtension implements Extension { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanClassToRegister.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanClassToRegister.java index 3656688e1b..05d824bf3a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanClassToRegister.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanClassToRegister.java @@ -17,7 +17,7 @@ /** * A valid bean class which will be registered manually using a CDI extension rather than auto-discovered by inclusion in a bean * archive. - * + * * @author Jason Porter * @author Dan Allen */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanRegistrationByExtensionInWarLibraryTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanRegistrationByExtensionInWarLibraryTest.java index 0136bdafa3..cbd5cbc521 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanRegistrationByExtensionInWarLibraryTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanRegistrationByExtensionInWarLibraryTest.java @@ -30,9 +30,9 @@ import org.testng.annotations.Test; /** - * + * * @author Tomas Remes - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class BeanRegistrationByExtensionInWarLibraryTest extends AbstractTest { @@ -48,7 +48,8 @@ public static WebArchive createTestArchive() { WebArchive webArchive = new WebArchiveBuilder() .withTestClass(BeanRegistrationByExtensionInWarLibraryTest.class) .withLibrary(BeanClassToRegister.class, ManualBeanRegistrationExtension.class, - AnotherBeanClassToRegister.class, AnotherManualBeanRegistrationExtension.class).build(); + AnotherBeanClassToRegister.class, AnotherManualBeanRegistrationExtension.class) + .build(); return webArchive; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/Beanie.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/Beanie.java index c440245401..309f5c8566 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/Beanie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/Beanie.java @@ -20,5 +20,5 @@ */ @BeanieType("basic") public class Beanie { - + } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieType.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieType.java index 24cdc51d7f..35fb19a2f3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieType.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieType.java @@ -18,6 +18,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import jakarta.inject.Qualifier; @Qualifier diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieTypeLiteral.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieTypeLiteral.java index 9c3201e376..57cc9773df 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieTypeLiteral.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/BeanieTypeLiteral.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/ManualBeanRegistrationExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/ManualBeanRegistrationExtension.java index 283281b8bb..e1e6778331 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/ManualBeanRegistrationExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/ManualBeanRegistrationExtension.java @@ -24,7 +24,7 @@ /** * An extension which registers a bean programmatically. - * + * * @author Jason Porter * @author Dan Allen */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassExtension.java index d18b3054c6..c575473415 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassExtension.java @@ -47,13 +47,14 @@ public AnnotatedType delegate() { // add @BeanieType("propeller")Beanie new AddForwardingAnnotatedTypeAction() { - final AnnotatedType delegate = new AnnotatedTypeWrapper(bm.createAnnotatedType(Beanie.class), false, new BeanieTypeLiteral() { + final AnnotatedType delegate = new AnnotatedTypeWrapper(bm.createAnnotatedType(Beanie.class), false, + new BeanieTypeLiteral() { - @Override - public String value() { - return "propeller"; - } - }); + @Override + public String value() { + return "propeller"; + } + }); @Override public String getBaseId() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassTest.java index 051a08b3db..07c8e9e252 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/TwoBeansOneClassTest.java @@ -40,11 +40,11 @@ public static WebArchive createTestArchive() { @Test(groups = INTEGRATION) @SpecAssertions({ - @SpecAssertion(section = INIT_EVENTS, id = "b"), - @SpecAssertion(section = INIT_EVENTS, id = "bb"), - @SpecAssertion(section = BEAN_ARCHIVE, id = "n"), - @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "af"), - @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "afa")}) + @SpecAssertion(section = INIT_EVENTS, id = "b"), + @SpecAssertion(section = INIT_EVENTS, id = "bb"), + @SpecAssertion(section = BEAN_ARCHIVE, id = "n"), + @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "af"), + @SpecAssertion(section = BEFORE_BEAN_DISCOVERY, id = "afa") }) public void testTwoBeansWithOneBaseClass() { assertEquals(beanManager.getBeans(Beanie.class).size(), 0); assertEquals(beanManager.getBeans(Beanie.class, new BeanieTypeLiteral() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java index ed85e2d535..963b9d3fcb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/extensions/registration/VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.java @@ -55,7 +55,8 @@ public static WebArchive createTestArchive() { .withTestClass(VisibilityOfBeanRegisteredByExtensionFromNonBeanLibraryTest.class) .withLibrary(BeanClassToRegister.class) .withLibrary(AnotherBeanClassToRegister.class, ManualBeanRegistrationExtension.class, - AnotherManualBeanRegistrationExtension.class).build(); + AnotherManualBeanRegistrationExtension.class) + .build(); } @Test(groups = INTEGRATION) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/BuiltInBeansTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/BuiltInBeansTest.java index 90951b4fb1..3233280b7f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/BuiltInBeansTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/BuiltInBeansTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,6 +21,7 @@ import java.security.Principal; import javax.security.auth.login.LoginException; + import jakarta.transaction.SystemException; import jakarta.transaction.UserTransaction; @@ -34,7 +35,7 @@ import org.testng.annotations.Test; /** - * + * * @author Pete Muir * @author Martin Kouba */ @@ -57,7 +58,7 @@ public void testUserTransactionBean() throws SystemException { } /** - * + * * @throws SystemException * @throws LoginException */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/MockLoginModule.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/MockLoginModule.java index 6416673a88..787bce607b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/MockLoginModule.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/MockLoginModule.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -48,7 +48,8 @@ public String getName() { return true; } - public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { + public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, + Map options) { this.subject = subject; this.options = options; this.callbackHandler = callbackHandler; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBean.java index 4f27826ec5..5e313677af 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -16,18 +16,18 @@ import java.security.Principal; import java.util.HashMap; -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Instance; -import jakarta.inject.Inject; - import javax.security.auth.login.AppConfigurationEntry; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; + /** * @author pmuir - * + * */ @Stateful public class PrincipalInjectedBean implements PrincipalInjectedBeanLocal { @@ -48,7 +48,7 @@ public void login() throws LoginException { protected AppConfigurationEntry createAppConfigurationEntry() { return new AppConfigurationEntry(MockLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED, - new HashMap()); + new HashMap()); } protected javax.security.auth.login.Configuration createConfiguration() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBeanLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBeanLocal.java index e3a7349c63..2a2dce6d5c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBeanLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/PrincipalInjectedBeanLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,12 +15,13 @@ import java.security.Principal; -import jakarta.ejb.Local; import javax.security.auth.login.LoginException; +import jakarta.ejb.Local; + /** * @author pmuir - * + * */ @Local public interface PrincipalInjectedBeanLocal { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBean.java index 2be8e088ea..aa880fb4c2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBeanLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBeanLocal.java index 922f88e6e9..e2ee34b4b1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBeanLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/UserTransactionInjectedBeanLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,7 +18,7 @@ /** * @author pmuir - * + * */ @Local public interface UserTransactionInjectedBeanLocal { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/ContainerManagedTransactionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/ContainerManagedTransactionBean.java index 1203af133e..1e09838f90 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/ContainerManagedTransactionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/ContainerManagedTransactionBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -21,7 +21,7 @@ import jakarta.transaction.UserTransaction; /** - * + * * @author Martin Kouba */ @Stateful diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/UserTransactionInvalidInjectionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/UserTransactionInvalidInjectionTest.java index 6ee8cb46be..cd47ae5d94 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/UserTransactionInvalidInjectionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/broken/transaction/UserTransactionInvalidInjectionTest.java @@ -32,7 +32,7 @@ /** * Test Java EE component class that has an injection point of type UserTransaction and qualifier Default, and may not validly * make use of the JTA UserTransaction according to the specification. - * + * * @author Martin Kouba */ @Test(groups = INTEGRATION) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/BuiltinMetadataEEBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/BuiltinMetadataEEBeanTest.java index d8fe752382..91fa4d9ff3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/BuiltinMetadataEEBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/BuiltinMetadataEEBeanTest.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.net.URL; -import com.gargoylesoftware.htmlunit.WebClient; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.test.api.ArquillianResource; @@ -31,6 +30,8 @@ import org.testng.Assert; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.WebClient; + /** * @author Tomas Remes */ @@ -58,5 +59,4 @@ public void interceptedBeanForEEComponentIsNullInInterceptor() throws IOExceptio } - } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/ServletInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/ServletInterceptor.java index 640196f99b..3435cb9118 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/ServletInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/ServletInterceptor.java @@ -35,7 +35,7 @@ public class ServletInterceptor { @AroundInvoke public Object aroundInvoke(InvocationContext invocationContext) throws Exception { - if(interceptedBean == null){ + if (interceptedBean == null) { counter.increment(); } return invocationContext.proceed(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/TestServlet.java index b13827306e..103b33f6f6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/ee/TestServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -15,6 +15,7 @@ package org.jboss.cdi.tck.tests.implementation.builtin.metadata.ee; import java.io.IOException; + import jakarta.inject.Inject; import jakarta.servlet.ServletException; import jakarta.servlet.ServletRequest; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BakeryProductDecorator.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BakeryProductDecorator.java index 237d65e1c6..49adb8f0cd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BakeryProductDecorator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BakeryProductDecorator.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java index 1230eb909e..2258d3be06 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/BuiltinMetadataSessionBeanTest.java @@ -17,11 +17,15 @@ import static org.jboss.cdi.tck.cdi.Sections.BEAN_METADATA; import static org.testng.Assert.assertEquals; +import java.lang.reflect.Type; +import java.util.Collections; + import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.Decorator; import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -32,9 +36,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.lang.reflect.Type; -import java.util.Collections; - /** * @author Tomas Remes */ @@ -48,7 +49,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(BuiltinMetadataSessionBeanTest.class) .withClasses(YoghurtInterceptor.class, Frozen.class) .withBeansXml( - new BeansXml().interceptors(YoghurtInterceptor.class).decorators(BakeryProductDecorator.class)).build(); + new BeansXml().interceptors(YoghurtInterceptor.class).decorators(BakeryProductDecorator.class)) + .build(); } @Inject @@ -76,7 +78,8 @@ public void testInterceptorMetadata() { @SpecAssertion(section = BEAN_METADATA, id = "f") }) public void testDecoratorMetadata() { Bean sessionBean = getUniqueBean(BakeryProduct.class); - Decorator decoratorInstance = getCurrentManager().resolveDecorators(Collections.singleton(BakeryProduct.class)) + Decorator decoratorInstance = getCurrentManager() + .resolveDecorators(Collections. singleton(BakeryProduct.class)) .iterator().next(); BakeryProductDecorator bakeryDecorator = bakery.getDecoratorInstance(); assertEquals(decoratorInstance, bakeryDecorator.getBean()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/Frozen.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/Frozen.java index 0c69432534..3ea6f8c1d5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/Frozen.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/metadata/session/Frozen.java @@ -6,13 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.implementation.builtin.metadata.session; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -20,10 +24,6 @@ import jakarta.enterprise.util.AnnotationLiteral; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @InterceptorBinding @Inherited @Target({ TYPE, METHOD }) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverter.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverter.java index ef4e839a26..8caf1660ee 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverter.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverter.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -39,7 +39,7 @@ public class LowercaseConverter implements Serializable { private ServletContext servletContext; /** - * + * * @param text * @return */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverterServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverterServlet.java index ea6d089959..2a67422201 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverterServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/LowercaseConverterServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/ServletContainerBuiltinBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/ServletContainerBuiltinBeanTest.java index 7aed2fd36c..4d0ac3c283 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/ServletContainerBuiltinBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/builtin/servlet/ServletContainerBuiltinBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -39,7 +39,7 @@ /** * Test that servlet container built-in beans are available for injection. - * + * * @author Martin Kouba */ @Test(groups = INTEGRATION) @@ -55,7 +55,8 @@ public static WebArchive createTestArchive() { LowercaseConverter lowercaseConverter; @Test - @SpecAssertions({ @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "da"), @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "db"), + @SpecAssertions({ @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "da"), + @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "db"), @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "dc") }) public void testBuiltinBeansAvailableForInjection() { @@ -72,7 +73,8 @@ public void testBuiltinBeansAvailableForInjection() { @RunAsClient @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "da"), @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "db"), + @SpecAssertions({ @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "da"), + @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "db"), @SpecAssertion(section = ADDITIONAL_BUILTIN_BEANS, id = "dc") }) public void testBuiltinBeansFromClient(@ArquillianResource URL contextPath) throws Exception { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/Apple.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/Apple.java index 307f38a530..4d56453c32 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/Apple.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/Apple.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTree.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTree.java index b3c8a605ba..92e3f518d9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTreeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTreeLocal.java index 5a26a06b53..6dc2b4b2d1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTreeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/AppleTreeLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/DisposalMethodOnSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/DisposalMethodOnSessionBeanTest.java index 4a033156e7..e626e713c8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/DisposalMethodOnSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/methodOnSessionBean/DisposalMethodOnSessionBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -41,7 +41,8 @@ public static WebArchive createTestArchive() { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD_EE, id = "a"), @SpecAssertion(section = DECLARING_DISPOSER_METHOD_EE, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = DISPOSER_METHOD_EE, id = "a"), + @SpecAssertion(section = DECLARING_DISPOSER_METHOD_EE, id = "a") }) public void testDisposalMethodNotBusinessOrStatic() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/Foo.java index f16ed7b191..a56c80b00e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/Foo.java @@ -1,18 +1,18 @@ -/* - * Copyright 2016, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.enterprise.remoteMethod; - -public class Foo { - -} +/* + * Copyright 2016, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.enterprise.remoteMethod; + +public class Foo { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposal.java index 7a291e0e28..608dc813ee 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposal.java @@ -1,30 +1,30 @@ -/* - * Copyright 2016, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.enterprise.remoteMethod; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; - -@Stateful -public class FooDisposal implements FooDisposalRemote { - - @Produces - static Foo foo = new Foo(); - - @Override - public void disposeFoo(@Disposes Foo foo) { - } - -} +/* + * Copyright 2016, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.enterprise.remoteMethod; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +@Stateful +public class FooDisposal implements FooDisposalRemote { + + @Produces + static Foo foo = new Foo(); + + @Override + public void disposeFoo(@Disposes Foo foo) { + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposalRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposalRemote.java index 83a2a621c3..05761682a5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposalRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/FooDisposalRemote.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.enterprise.remoteMethod; - -import jakarta.ejb.Remote; - -@Remote -public interface FooDisposalRemote { - - void disposeFoo(Foo foo); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.enterprise.remoteMethod; + +import jakarta.ejb.Remote; + +@Remote +public interface FooDisposalRemote { + + void disposeFoo(Foo foo); + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/RemoteBusinessDisposalMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/RemoteBusinessDisposalMethodTest.java index e786d29afc..b3ced848b9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/RemoteBusinessDisposalMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/enterprise/remoteMethod/RemoteBusinessDisposalMethodTest.java @@ -6,14 +6,20 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.broken.enterprise.remoteMethod; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; +import static org.jboss.cdi.tck.cdi.Sections.DECLARING_DISPOSER_METHOD_EE; +import static org.jboss.cdi.tck.cdi.Sections.DISPOSER_METHOD_EE; + +import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -23,12 +29,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import jakarta.enterprise.inject.spi.DefinitionException; - -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.DECLARING_DISPOSER_METHOD_EE; -import static org.jboss.cdi.tck.cdi.Sections.DISPOSER_METHOD_EE; - @SpecVersion(spec = "cdi", version = "2.0") public class RemoteBusinessDisposalMethodTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/BrokenFoodProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/BrokenFoodProducer.java index a5812be306..a34c1013ce 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/BrokenFoodProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/BrokenFoodProducer.java @@ -22,11 +22,11 @@ public class BrokenFoodProducer { @Produces - public Food cookSomething(){ - return new Food(); + public Food cookSomething() { + return new Food(); } - public void eatFood(@Disposes @ObservesAsync Food food){ + public void eatFood(@Disposes @ObservesAsync Food food) { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/DisposerMethodWithAsyncObservesTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/DisposerMethodWithAsyncObservesTest.java index eb6a24309d..14aedcd38c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/DisposerMethodWithAsyncObservesTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/broken/observes/async/DisposerMethodWithAsyncObservesTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Chicken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Chicken.java index 38394bfc8c..58e1b36396 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Chicken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Chicken.java @@ -1,39 +1,40 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Any; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; -import org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.Yummy; - -@Stateful -public class Chicken { - - @Produces - @Yummy - public Egg produceYummyEgg() { - return new Egg(this); - } - - public void disposeEgg(@Disposes @Any Egg egg) { - Egg.disposedBy.add(getOriginClass()); - } - - public Class getOriginClass() { - return Chicken.class; - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +import org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.Yummy; + +@Stateful +public class Chicken { + + @Produces + @Yummy + public Egg produceYummyEgg() { + return new Egg(this); + } + + public void disposeEgg(@Disposes @Any Egg egg) { + Egg.disposedBy.add(getOriginClass()); + } + + public Class getOriginClass() { + return Chicken.class; + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Code.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Code.java index 95c5fd2d03..4ec513aaf2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Code.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Code.java @@ -1,33 +1,33 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; - -import java.util.ArrayList; -import java.util.List; - -public class Code { - - public static List> disposedBy = new ArrayList>(); - - private Programmer programmer; - - public Code(Programmer programmer) { - this.programmer = programmer; - } - - public Programmer getProgrammer() { - return programmer; - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; + +import java.util.ArrayList; +import java.util.List; + +public class Code { + + public static List> disposedBy = new ArrayList>(); + + private Programmer programmer; + + public Code(Programmer programmer) { + this.programmer = programmer; + } + + public Programmer getProgrammer() { + return programmer; + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/DisposerMethodInheritanceTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/DisposerMethodInheritanceTest.java index 5647566536..889163948c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/DisposerMethodInheritanceTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/DisposerMethodInheritanceTest.java @@ -14,6 +14,10 @@ package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.MEMBER_LEVEL_INHERITANCE_EE; +import static org.testng.Assert.assertEquals; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -25,10 +29,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.MEMBER_LEVEL_INHERITANCE_EE; -import static org.testng.Assert.assertEquals; - /** * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Egg.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Egg.java index 04f9b4028a..8598b92934 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Egg.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Egg.java @@ -1,32 +1,32 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; - -import java.util.ArrayList; -import java.util.List; - -public class Egg { - - public static List> disposedBy = new ArrayList>(); - - private Chicken chicken; - - public Egg(Chicken chicken) { - this.chicken = chicken; - } - - public Chicken getChicken() { - return chicken; - } -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; + +import java.util.ArrayList; +import java.util.List; + +public class Egg { + + public static List> disposedBy = new ArrayList>(); + + private Chicken chicken; + + public Egg(Chicken chicken) { + this.chicken = chicken; + } + + public Chicken getChicken() { + return chicken; + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Guru.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Guru.java index 55e1770ef9..4b1797c005 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Guru.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Guru.java @@ -1,34 +1,34 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Produces; - -/** - * Test that {@link Programmer#disposeCode(Code)} is not inherited. - */ -@Stateful -public class Guru extends Programmer { - - @Produces - public Code produceDefaultCode() { - return new Code(this); - } - - public Class getOriginClass() { - return Guru.class; - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Produces; + +/** + * Test that {@link Programmer#disposeCode(Code)} is not inherited. + */ +@Stateful +public class Guru extends Programmer { + + @Produces + public Code produceDefaultCode() { + return new Code(this); + } + + public Class getOriginClass() { + return Guru.class; + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Programmer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Programmer.java index 371fd381ca..24ab3c80b1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Programmer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/disposal/method/definition/inheritance/ejb/Programmer.java @@ -1,39 +1,40 @@ -/* - * Copyright 2012, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Any; -import jakarta.enterprise.inject.Disposes; -import jakarta.enterprise.inject.Produces; -import org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.Yummy; - -@Stateful -public class Programmer { - - @Produces - @Yummy - public Code produceYummyCode() { - return new Code(this); - } - - public void disposeCode(@Disposes @Any Code code) { - Code.disposedBy.add(this.getClass()); - } - - public Class getOriginClass() { - return Programmer.class; - } - -} +/* + * Copyright 2012, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.ejb; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; + +import org.jboss.cdi.tck.tests.implementation.disposal.method.definition.inheritance.Yummy; + +@Stateful +public class Programmer { + + @Produces + @Yummy + public Code produceYummyCode() { + return new Code(this); + } + + public void disposeCode(@Disposes @Any Code code) { + Code.disposedBy.add(this.getClass()); + } + + public Class getOriginClass() { + return Programmer.class; + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/DingoLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/DingoLocal_Broken.java index c2b2398d52..b31fec1006 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/DingoLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/DingoLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/Dingo_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/Dingo_Broken.java index 18d33f1a8c..44518e8ff0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/Dingo_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/Dingo_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/GenericStatelessSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/GenericStatelessSessionBeanTest.java index 59341793f1..6304d0094a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/GenericStatelessSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/genericStateless/GenericStatelessSessionBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java index 6424f23892..8d6e5f4508 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/Husky_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.broken.singletonWithConversationScope; - -import jakarta.ejb.Singleton; -import jakarta.enterprise.context.ConversationScoped; - -@Singleton -@ConversationScoped -public class Husky_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.broken.singletonWithConversationScope; + +import jakarta.ejb.Singleton; +import jakarta.enterprise.context.ConversationScoped; + +@Singleton +@ConversationScoped +public class Husky_Broken { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java index bf0d1222d0..e193ad1dce 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithConversationScope/SingletonWithConversationScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java index 60375d700c..32fcdf5fb9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.broken.singletonWithRequestScope; - -import jakarta.ejb.Singleton; -import jakarta.enterprise.context.RequestScoped; - -@Singleton -@RequestScoped -public class Greyhound_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.broken.singletonWithRequestScope; + +import jakarta.ejb.Singleton; +import jakarta.enterprise.context.RequestScoped; + +@Singleton +@RequestScoped +public class Greyhound_Broken { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java index 253cfbbab8..278ff90261 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java index 4edac5071b..2e5f66d435 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Broken.java @@ -1,30 +1,30 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.broken.singletonWithSessionScope; - -import java.io.Serializable; - -import jakarta.ejb.Singleton; -import jakarta.enterprise.context.SessionScoped; - -@Singleton -@SessionScoped -public class IrishTerrier_Broken implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -1628520203303413522L; - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.broken.singletonWithSessionScope; + +import java.io.Serializable; + +import jakarta.ejb.Singleton; +import jakarta.enterprise.context.SessionScoped; + +@Singleton +@SessionScoped +public class IrishTerrier_Broken implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -1628520203303413522L; + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java index 7634bd43be..fefbd91788 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/BulldogLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/BulldogLocal_Broken.java index 17f96b604b..f64547fee6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/BulldogLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/BulldogLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Bulldog_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Bulldog_Broken.java index 040ad5d8ce..fce2137031 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Bulldog_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Bulldog_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Colie.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Colie.java index 08bf65d65f..4d43ea174c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Colie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Colie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/DecoratorAnnotatedStatelessSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/DecoratorAnnotatedStatelessSessionBeanTest.java index 65b61c5784..1b8d8af725 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/DecoratorAnnotatedStatelessSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/DecoratorAnnotatedStatelessSessionBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Dog.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Dog.java index 6f7bb86403..de683d0aa9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Dog.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessDecorator/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/DalmatianLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/DalmatianLocal_Broken.java index 58f5f2e20d..43dcb6624d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/DalmatianLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/DalmatianLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/Dalmatian_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/Dalmatian_Broken.java index efd9ef22ac..cb6ccc1fed 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/Dalmatian_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/Dalmatian_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/InterceptorAnnotatedStatelessSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/InterceptorAnnotatedStatelessSessionBeanTest.java index a227dcd663..4f842415fd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/InterceptorAnnotatedStatelessSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessInterceptor/InterceptorAnnotatedStatelessSessionBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java index 3e52787abb..302e6f6593 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/DachshundLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java index b87c7bc8e4..860c974386 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope; - -import jakarta.ejb.Stateless; -import jakarta.enterprise.context.ApplicationScoped; - -@Stateless -@ApplicationScoped -public class Dachshund_Broken implements DachshundLocal_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithApplicationScope; + +import jakarta.ejb.Stateless; +import jakarta.enterprise.context.ApplicationScoped; + +@Stateless +@ApplicationScoped +public class Dachshund_Broken implements DachshundLocal_Broken { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java index 503c53bc2b..fe76b2ac07 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithApplicationScope/StatelessWithApplicationScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java index 87326a8fe5..5c0e4699c6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/BoxerLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java index c7f3a31c17..ec27cbaf47 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/Boxer_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithConversationScope; - -import jakarta.ejb.Stateless; -import jakarta.enterprise.context.ConversationScoped; - -@Stateless -@ConversationScoped -public class Boxer_Broken implements BoxerLocal_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithConversationScope; + +import jakarta.ejb.Stateless; +import jakarta.enterprise.context.ConversationScoped; + +@Stateless +@ConversationScoped +public class Boxer_Broken implements BoxerLocal_Broken { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java index 7ce507fcf5..420c2eddd6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithConversationScope/StatelessWithConversationScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java index 43301f49a0..05ea212c36 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/BeagleLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java index e48bf50c84..14b16fe476 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithRequestScope; - -import jakarta.ejb.Stateless; -import jakarta.enterprise.context.RequestScoped; - -@Stateless -@RequestScoped -public class Beagle_Broken implements BeagleLocal_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithRequestScope; + +import jakarta.ejb.Stateless; +import jakarta.enterprise.context.RequestScoped; + +@Stateless +@RequestScoped +public class Beagle_Broken implements BeagleLocal_Broken { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java index ce318c2775..f6e580da70 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithRequestScope/StatelessWithRequestScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java index 28bb00d596..acee0e1f71 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/BullmastiffLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java index 3daa7c8101..892ac0cb87 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Broken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithSessionScope; - -import jakarta.ejb.Stateless; -import jakarta.enterprise.context.SessionScoped; - -@Stateless -@SessionScoped -public class Bullmastiff_Broken implements BullmastiffLocal_Broken { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.broken.statelessWithSessionScope; + +import jakarta.ejb.Stateless; +import jakarta.enterprise.context.SessionScoped; + +@Stateless +@SessionScoped +public class Bullmastiff_Broken implements BullmastiffLocal_Broken { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java index 82f533dae8..760faa5cd4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/broken/statelessWithSessionScope/StatelessWithSessionScopeTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Ape.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Ape.java index 0d422a220b..ab3df2183a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Ape.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Ape.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ApeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ApeLocal.java index d34ecc8cbd..b640027412 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ApeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ApeLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Dog.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Dog.java index d954e48902..ea6d868ea2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Dog.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Dog.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/DogLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/DogLocal.java index d0856849c9..b527e3f7e1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/DogLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/DogLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Elephant.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Elephant.java index 382ac2b462..e7040d7367 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Elephant.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Elephant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ElephantLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ElephantLocal.java index eec24913c0..8a902562a4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ElephantLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ElephantLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 5e092fc9d1..4049da3123 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 @@ -26,7 +26,6 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -62,7 +61,8 @@ public void testStatelessMustBeDependentScoped() { } @Test - @SpecAssertions({ @SpecAssertion(section = INSTANTIATION_EE, id = "a"), @SpecAssertion(section = INSTANTIATION_EE, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = INSTANTIATION_EE, id = "a"), + @SpecAssertion(section = INSTANTIATION_EE, id = "ab") }) public void testConstructorAnnotatedInjectCalled() { ExplicitConstructor bean = getContextualReference(ExplicitConstructor.class); assert bean.getConstructorCalls() == 1; @@ -89,7 +89,8 @@ public void testSingletonWithApplicationScopeOK() { } @Test - @SpecAssertions({ @SpecAssertion(section = SESSION_BEAN_TYPES, id = "aa"), @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "c") }) + @SpecAssertions({ @SpecAssertion(section = SESSION_BEAN_TYPES, id = "aa"), + @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "c") }) public void testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces() { Bean dogBean = getBeans(DogLocal.class).iterator().next(); assert dogBean.getTypes().contains(DogLocal.class); @@ -106,14 +107,16 @@ public void testEnterpriseBeanClassLocalView() { } @Test - @SpecAssertions({ @SpecAssertion(section = SESSION_BEAN_TYPES, id = "c"), @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = SESSION_BEAN_TYPES, id = "c"), + @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "aa") }) public void testObjectIsInAPITypes() { assert getBeans(GiraffeLocal.class).size() == 1; assert getBeans(GiraffeLocal.class).iterator().next().getTypes().contains(Object.class); } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "ba"), @SpecAssertion(section = SESSION_BEANS, id = "e") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "ba"), + @SpecAssertion(section = SESSION_BEANS, id = "e") }) public void testBeanWithScopeAnnotation() { Bean lionBean = getBeans(LionLocal.class).iterator().next(); assert lionBean.getScope().equals(RequestScoped.class); @@ -127,7 +130,8 @@ public void testBeanWithNamedAnnotation() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "bd"), @SpecAssertion(section = SESSION_BEAN_NAME, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_SESSION_BEAN, id = "bd"), + @SpecAssertion(section = SESSION_BEAN_NAME, id = "a") }) public void testBeanWithStereotype() { Bean polarBearBean = getBeans(PolarBearLocal.class).iterator().next(); assert polarBearBean.getScope().equals(RequestScoped.class); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java index 0e4fb647af..dde88a11ab 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/EnterpriseBeanViaXmlTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ /** * These tests are any that involve ejb-jar.xml resources. - * + * * @author David Allen */ @SpecVersion(spec = "cdi", version = "2.0") @@ -49,7 +49,8 @@ public static EnterpriseArchive createTestArchive() { } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = WHAT_CLASSES_ARE_BEANS_EE, id = "b"), @SpecAssertion(section = SESSION_BEAN_TYPES, id = "ba") }) + @SpecAssertions({ @SpecAssertion(section = WHAT_CLASSES_ARE_BEANS_EE, id = "b"), + @SpecAssertion(section = SESSION_BEAN_TYPES, id = "ba") }) public void testEjbDeclaredInXmlNotSimpleBean() { Bean elephantBean = getBeans(ElephantLocal.class).iterator().next(); // The interface is a known type but the class should not be diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java index e8e8012f6c..f1a11f241c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java index 8c65c9b643..f751e3ffdd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/ExplicitConstructorSessionBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Giraffe.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Giraffe.java index 3c43029af9..2abf136ddb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Giraffe.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Giraffe.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/GiraffeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/GiraffeLocal.java index 1a03e1af40..d8f60a1a21 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/GiraffeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/GiraffeLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Labrador.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Labrador.java index f8ca13665e..afb56d3933 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Labrador.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Labrador.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Laika.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Laika.java index d6d47d14e7..d74edadc87 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Laika.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Laika.java @@ -1,22 +1,22 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.definition; - -import jakarta.ejb.Singleton; -import jakarta.enterprise.context.ApplicationScoped; - -@Singleton -@ApplicationScoped -public class Laika { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.definition; + +import jakarta.ejb.Singleton; +import jakarta.enterprise.context.ApplicationScoped; + +@Singleton +@ApplicationScoped +public class Laika { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Lion.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Lion.java index 146dfd6f22..585acf794f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Lion.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Lion.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/LionLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/LionLocal.java index a624e35b46..9691b5c37a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/LionLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/LionLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Monkey.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Monkey.java index f0930b1aad..948fc45b12 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Monkey.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Monkey.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/MonkeyLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/MonkeyLocal.java index 25d0676f5f..54f561cb7b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/MonkeyLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/MonkeyLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Pitbull.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Pitbull.java index c370188ee9..d25e1ada88 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Pitbull.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Pitbull.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.definition; - -import jakarta.ejb.Remove; -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Default; -import jakarta.inject.Named; - -@Stateful -@ApplicationScoped -@Named -@Default -public class Pitbull extends Dog implements PitbullLocal, DogLocal { - - public static boolean destructorCalled = false; - - @Remove - public void bye() { - destructorCalled = true; - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.definition; + +import jakarta.ejb.Remove; +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Named; + +@Stateful +@ApplicationScoped +@Named +@Default +public class Pitbull extends Dog implements PitbullLocal, DogLocal { + + public static boolean destructorCalled = false; + + @Remove + public void bye() { + destructorCalled = true; + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PitbullLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PitbullLocal.java index b3279cd085..6e3cd8836d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PitbullLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PitbullLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Polar.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Polar.java index ff2f74c8d0..551520784c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Polar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Polar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBear.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBear.java index 9025d372f5..576226b310 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBear.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBear.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBearLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBearLocal.java index 9a8215aad2..30d9e727df 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBearLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/PolarBearLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Retriever.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Retriever.java index da370a47d6..fe1023dcc9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Retriever.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/Retriever.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ /** * @author pmuir - * + * */ @Stateful public class Retriever extends Dog { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/SimpleBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/SimpleBean.java index 12f38f6385..96dafdb942 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/SimpleBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/SimpleBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 e198b061b9..cc854e2252 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogLocal.java index 00a116291b..a44a24e6aa 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogRemote.java index 40d7842df5..e22acb3753 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/DogRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Pitbull.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Pitbull.java index 357c4743e1..387f764d8d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Pitbull.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/definition/remote/Pitbull.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote; - -import jakarta.ejb.Local; -import jakarta.ejb.Stateful; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Named; - -@Stateful -@ApplicationScoped -@Named -@Local({ org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote.Bar.class, - org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote.DogLocal.class }) -public class Pitbull implements DogRemote { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote; + +import jakarta.ejb.Local; +import jakarta.ejb.Stateful; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Named; + +@Stateful +@ApplicationScoped +@Named +@Local({ org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote.Bar.class, + org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote.DogLocal.class }) +public class Pitbull implements DogRemote { + +} 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 9e91b63320..24b2b2c361 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 @@ -20,7 +20,6 @@ import static org.testng.Assert.assertNotNull; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; 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 3b8f7d05ac..590fab246a 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 @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Tame { - class Literal extends AnnotationLiteral implements Tame { - } -} +package org.jboss.cdi.tck.tests.implementation.enterprise.definition.remote; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/AlteStadt.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java index 9671cae110..9f3334cfc5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/AlteStadt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java index 77f17185ab..b62f323529 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessor.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; - -import jakarta.ejb.Stateful; - -@Stateful -public class DirectOrderProcessor extends OrderProcessor implements DirectOrderProcessorLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; + +import jakarta.ejb.Stateful; + +@Stateful +public class DirectOrderProcessor extends OrderProcessor implements DirectOrderProcessorLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java index c1edf6312a..ae2b294450 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/DirectOrderProcessorLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; - -import jakarta.ejb.Local; - -@Local -public interface DirectOrderProcessorLocal { - void order(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; + +import jakarta.ejb.Local; + +@Local +public interface DirectOrderProcessorLocal { + void order(); +} 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 69dc7ad1a5..de6a9cde4a 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 @@ -28,7 +28,6 @@ import jakarta.enterprise.context.spi.Context; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -63,8 +62,9 @@ public static WebArchive createTestArchive() { .build(); } - @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = STATEFUL_LIFECYCLE, id = "bb"), @SpecAssertion(section = CONTEXTUAL_REFERENCE, id = "b"), + @Test(groups = INTEGRATION) + @SpecAssertions({ @SpecAssertion(section = STATEFUL_LIFECYCLE, id = "bb"), + @SpecAssertion(section = CONTEXTUAL_REFERENCE, id = "b"), @SpecAssertion(section = BEAN_ARCHIVE_EE, id = "ja") }) public void testCreateSFSB() throws Exception { GrossStadt frankfurt = getContextualReference(GrossStadt.class); @@ -90,7 +90,7 @@ public void testCreateSFSB() throws Exception { assert stadtInstance instanceof SchoeneStadt; } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertions({ @SpecAssertion(section = PASSIVATION_CAPABLE_DEPENDENCY_EE, id = "ac") }) public void testSerializeSFSB() throws Exception { @@ -103,8 +103,9 @@ public void testSerializeSFSB() throws Exception { } - @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = STATEFUL_LIFECYCLE, id = "bc"), @SpecAssertion(section = STATELESS_LIFECYCLE, id = "c") }) + @Test(groups = INTEGRATION) + @SpecAssertions({ @SpecAssertion(section = STATEFUL_LIFECYCLE, id = "bc"), + @SpecAssertion(section = STATELESS_LIFECYCLE, id = "c") }) public void testDestroyRemovesSFSB() throws Exception { GrossStadt frankfurt = getContextualReference(GrossStadt.class); Bean stadtBean = getBeans(KleinStadt.class).iterator().next(); @@ -121,8 +122,9 @@ public void testDestroyRemovesSFSB() throws Exception { // frankfurt.dispose(); } - @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = STATELESS_LIFECYCLE, id = "c"), @SpecAssertion(section = SESSION_BEAN_EJB_REMOVE_METHOD, id = "dba") }) + @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 Important.Literal()); assert stadtInstance != null : "Expected instance to be created by container"; @@ -135,7 +137,7 @@ public void testRemovedEjbIgnored() { assert !"Kassel-Wilhelmshoehe".equals(newStadtInstance.getName()) : "The destroyed SFSB was not ignored"; } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertions({ @SpecAssertion(section = STATELESS_LIFECYCLE, id = "b") }) public void testCreateSLSB() { Bean stadtBean = getBeans(NeueStadt.class).iterator().next(); @@ -149,7 +151,7 @@ public void testCreateSLSB() { assert stadtInstance instanceof GeschichtslosStadt; } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "f") public void testInitializerMethodsCalledWithCurrentParameterValues() { AlteStadt alteStadt = getContextualReference(AlteStadt.class); @@ -157,7 +159,7 @@ public void testInitializerMethodsCalledWithCurrentParameterValues() { assert alteStadt.getAnotherPlaceOfInterest() != null; } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = DEPENDENT_OBJECTS_DESTRUCTION_EE, id = "a") public void testDependentObjectsDestroyed() { Bean uniStadtBean = getBeans(UniStadt.class).iterator().next(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java index 41f9efc1b1..79aa1dd532 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java index aad6b2efa4..e6a70a50fe 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GeschichtslosStadt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Giessen.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Giessen.java index 6bdb47cc3d..d868e41a17 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Giessen.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Giessen.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java index 2e69c5a2a7..262906c92b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GrossStadt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java index 2bb9a72f23..ad4aee278d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/GutenbergMuseum.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java index 3e9dc5ee53..8965144050 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Heidelburg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 9bad48cac2..633047b165 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java index 23374fda0d..a7c1ddec46 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IndirectOrderProcessor.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; - -import jakarta.ejb.Stateful; - -@Stateful -public class IndirectOrderProcessor extends IntermediateOrderProcessor implements OrderProcessorLocal { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; + +import jakarta.ejb.Stateful; + +@Stateful +public class IndirectOrderProcessor extends IntermediateOrderProcessor implements OrderProcessorLocal { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java index 897e3a0f60..fb14367c81 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/IntermediateOrderProcessor.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; - -public class IntermediateOrderProcessor extends OrderProcessor { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; + +public class IntermediateOrderProcessor extends OrderProcessor { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Kassel.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Kassel.java index 5092ac8663..a0ab2212bc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Kassel.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Kassel.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java index e69e552c48..914b3d4b3e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java index b6312ef703..742a90b896 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/LandgraffenSchloss.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Mainz.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Mainz.java index 5c97fd4cf6..b8a4785964 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Mainz.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Mainz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Marburg.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Marburg.java index a397001006..44d4085647 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Marburg.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Marburg.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java index 3a2ac49760..bb974d7971 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/NeueStadt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java index 94938100cf..a45bd7f844 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessor.java @@ -1,38 +1,38 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; - -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; - -public class OrderProcessor { - public static boolean postConstructCalled = false; - - public static boolean preDestroyCalled = true; - - @PostConstruct - public void postConstruct() { - postConstructCalled = true; - } - - @PreDestroy - public void preDestroy() { - preDestroyCalled = true; - } - - public void order() { - - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; + +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + +public class OrderProcessor { + public static boolean postConstructCalled = false; + + public static boolean preDestroyCalled = true; + + @PostConstruct + public void postConstruct() { + postConstructCalled = true; + } + + @PreDestroy + public void preDestroy() { + preDestroyCalled = true; + } + + public void order() { + + } + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java index d6c9ac114a..d0576fcd60 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/OrderProcessorLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; - -import jakarta.ejb.Local; - -@Local -public interface OrderProcessorLocal { - void order(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.enterprise.lifecycle; + +import jakarta.ejb.Local; + +@Local +public interface OrderProcessorLocal { + void order(); +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java index 7ecd4168f5..f06f2423bc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/RoemerPassage.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Schloss.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Schloss.java index 6721e265fe..7524265e7d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Schloss.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/Schloss.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java index 27c5275539..76bb706747 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/SchoeneStadt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/UniStadt.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/UniStadt.java index 24c7aa2b13..844e9534b2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/UniStadt.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/lifecycle/UniStadt.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionBean.java index cb8e04f739..0ed965d50d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java index a1bc460c3f..531dfc1b01 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/DependentSessionInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java index 3451e562b7..9b697be0f0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,7 @@ import org.testng.annotations.Test; /** - * + * * @author Nicklas Karlsson * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java index 4f565ebbf6..438f93510a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java index 21a055de2e..2cde237540 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/SessionScopedSessionInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/StateKeeper.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/StateKeeper.java index 75865885cf..df9d2cfaf4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/StateKeeper.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/enterprise/remove/StateKeeper.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,8 +20,8 @@ @ApplicationScoped public class StateKeeper implements Serializable { /** - * - */ + * + */ private static final long serialVersionUID = -7168331316716402245L; private boolean removeCalled = false; private boolean beanDestroyed = false; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/AndalusianChicken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/AndalusianChicken.java index b1063af819..b11bfd902b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/AndalusianChicken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/AndalusianChicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/EjbInitializerMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/EjbInitializerMethodTest.java index 5d53bc25fb..1a6133176f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/EjbInitializerMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/EjbInitializerMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -34,7 +34,7 @@ public static WebArchive createTestArchive() { .build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertions({ @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "e") }) // This DOES NOT TEST initializer methods on Java EE component classes PLM public void testInitializerMethodNotABusinessMethod() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/LocalChicken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/LocalChicken.java index dac5d279ba..a8d0b6250d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/LocalChicken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/initializer/ejb/LocalChicken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/FooLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/FooLocal_Broken.java index a403e8d52c..d528e5e4a7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/FooLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/FooLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/Foo_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/Foo_Broken.java index 061be9b1f0..85c55472fb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/Foo_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/Foo_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java index 3d1f50272d..5ae9aa4ad8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/broken/enterprise/nonstatic/NonStaticFieldOfSessionBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java index fa4b1f7cc7..8e8b64f008 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Chicken.java @@ -1,27 +1,27 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Produces; - -@Stateful -public class Chicken implements ChickenLocal { - - public static final int SIZE = 5; - - @Produces - @Foo - private static Egg egg = new Egg(SIZE); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Produces; + +@Stateful +public class Chicken implements ChickenLocal { + + public static final int SIZE = 5; + + @Produces + @Foo + private static Egg egg = new Egg(SIZE); +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/ChickenLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/ChickenLocal.java index a9e575df8d..03d1178e6b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/ChickenLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/ChickenLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface ChickenLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface ChickenLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Egg.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Egg.java index 674bf33692..42597099fd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Egg.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/field/definition/enterprise/Egg.java @@ -1,32 +1,32 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; - -public class Egg { - - private final int size; - - public Egg(int size) { - super(); - this.size = size; - } - - /** - * @return the size - */ - public int getSize() { - return size; - } - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; + +public class Egg { + + private final int size; + + public Egg(int size) { + super(); + this.size = size; + } + + /** + * @return the size + */ + public int getSize() { + return size; + } + +} 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 a23ac3e72f..3113be2cc0 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,8 +17,6 @@ import static org.jboss.cdi.tck.cdi.Sections.PRODUCER_FIELD; import static org.jboss.cdi.tck.cdi.Sections.PRODUCER_FIELD_EE; -import jakarta.enterprise.util.AnnotationLiteral; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -37,7 +35,8 @@ public static WebArchive createTestArchive() { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "a"), @SpecAssertion(section = PRODUCER_FIELD_EE, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = PRODUCER_FIELD, id = "a"), + @SpecAssertion(section = PRODUCER_FIELD_EE, id = "a") }) public void testStaticProducerField() { 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 cc3f569936..b3a9c0be60 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Foo { - class Literal extends AnnotationLiteral implements Foo { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.field.definition.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/broken/enterprise/nonbusiness/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/Foo.java index 7fe171f608..fda519750f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/Foo.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; - -public class Foo { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; + +public class Foo { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java index f0bfcd5e42..3cce5809ee 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.java @@ -1,25 +1,25 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Produces; - -@Stateful -public class FooProducer implements FooProducerLocal { - @Produces - Foo createFoo() { - return new Foo(); - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Produces; + +@Stateful +public class FooProducer implements FooProducerLocal { + @Produces + Foo createFoo() { + return new Foo(); + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducerLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducerLocal.java index 192fec74e0..ef951fd4c0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducerLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/FooProducerLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; - -import jakarta.ejb.Local; - -@Local -public interface FooProducerLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.nonbusiness; + +import jakarta.ejb.Local; + +@Local +public interface FooProducerLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java index 7eeeb43af0..091059dbf8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/nonbusiness/ProducerMethodNotBusinessMethodTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -39,7 +39,8 @@ public static WebArchive createTestArchive() { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD_EE, id = "a"), @SpecAssertion(section = PRODUCER_METHOD_EE, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_PRODUCER_METHOD_EE, id = "a"), + @SpecAssertion(section = PRODUCER_METHOD_EE, id = "a") }) public void testProducerMethodOnSessionBeanMustBeBusinessMethod() { } } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/Foo.java index 4972091cf2..8c25b298af 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/Foo.java @@ -1,18 +1,18 @@ -/* - * Copyright 2016, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.remoteMethod; - -public class Foo { - -} +/* + * Copyright 2016, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.remoteMethod; + +public class Foo { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducer.java index 5941ad4b41..b9f3357e1b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducer.java @@ -1,26 +1,26 @@ -/* - * Copyright 2016, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.remoteMethod; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Produces; - -@Stateful -public class FooProducer implements FooProducerRemote { - - @Produces - public Foo createFoo() { - return new Foo(); - } -} +/* + * Copyright 2016, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.remoteMethod; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Produces; + +@Stateful +public class FooProducer implements FooProducerRemote { + + @Produces + public Foo createFoo() { + return new Foo(); + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducerRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducerRemote.java index 532ba43c5f..617b15e6d5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducerRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/FooProducerRemote.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.remoteMethod; - -import jakarta.ejb.Remote; - -@Remote -public interface FooProducerRemote { - - Foo createFoo(); - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.remoteMethod; + +import jakarta.ejb.Remote; + +@Remote +public interface FooProducerRemote { + + Foo createFoo(); + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/RemoteBusinessProducerMethodTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/RemoteBusinessProducerMethodTest.java index 625142c50b..9086b72bb6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/RemoteBusinessProducerMethodTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/broken/enterprise/remoteMethod/RemoteBusinessProducerMethodTest.java @@ -6,14 +6,20 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.implementation.producer.method.broken.enterprise.remoteMethod; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; +import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_METHOD_EE; +import static org.jboss.cdi.tck.cdi.Sections.PRODUCER_METHOD_EE; + +import jakarta.enterprise.inject.spi.DefinitionException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -23,12 +29,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import jakarta.enterprise.inject.spi.DefinitionException; - -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.DECLARING_PRODUCER_METHOD_EE; -import static org.jboss.cdi.tck.cdi.Sections.PRODUCER_METHOD_EE; - @SpecVersion(spec = "cdi", version = "2.0") public class RemoteBusinessProducerMethodTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java index 1ac11ce21d..8ea2a5c486 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java @@ -1,23 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Specializes; - -@Stateful -@Specializes -public class AndalusianChicken extends Chicken implements AndalusianChickenLocal, ChickenLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Specializes; + +@Stateful +@Specializes +public class AndalusianChicken extends Chicken implements AndalusianChickenLocal, ChickenLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java index cc6ea8b06a..091e7bb98b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChickenLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface AndalusianChickenLocal extends ChickenLocal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface AndalusianChickenLocal extends ChickenLocal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Apple.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Apple.java index d7ddb13d7a..8639925075 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Apple.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Apple.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -public class Apple { - private AppleTree tree; - - public Apple(AppleTree tree) { - this.tree = tree; - } - - public AppleTree getTree() { - return tree; - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +public class Apple { + private AppleTree tree; + + public Apple(AppleTree tree) { + this.tree = tree; + } + + public AppleTree getTree() { + return tree; + } } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java index 918924908e..52a5c958f1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTree.java @@ -1,26 +1,26 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Produces; - -@Stateful -public class AppleTree implements AppleTreeLocal { - @Produces - @Yummy - public Apple produceApple() { - return new Apple(this); - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Produces; + +@Stateful +public class AppleTree implements AppleTreeLocal { + @Produces + @Yummy + public Apple produceApple() { + return new Apple(this); + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTreeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTreeLocal.java index 0017e41b87..dacc5f7f06 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTreeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/AppleTreeLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface AppleTreeLocal { - public Apple produceApple(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface AppleTreeLocal { + public Apple produceApple(); +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java index bc1443a867..769870e6ce 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Chicken.java @@ -1,28 +1,28 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import jakarta.ejb.Stateful; -import jakarta.enterprise.inject.Produces; - -@Stateful -public class Chicken implements ChickenLocal { - - @Produces - @Yummy - public Egg produceEgg() { - return new Egg(this); - } - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import jakarta.ejb.Stateful; +import jakarta.enterprise.inject.Produces; + +@Stateful +public class Chicken implements ChickenLocal { + + @Produces + @Yummy + public Egg produceEgg() { + return new Egg(this); + } + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/ChickenLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/ChickenLocal.java index 49f95a4b06..8b3d49dd19 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/ChickenLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/ChickenLocal.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import jakarta.ejb.Local; - -@Local -public interface ChickenLocal { - public Egg produceEgg(); -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import jakarta.ejb.Local; + +@Local +public interface ChickenLocal { + public Egg produceEgg(); +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Egg.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Egg.java index ae4041e1e8..5653568fe9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Egg.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Egg.java @@ -1,27 +1,27 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -public class Egg { - private final Chicken mother; - - public Egg(Chicken mother) { - this.mother = mother; - } - - public Chicken getMother() { - return mother; - } - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +public class Egg { + private final Chicken mother; + + public Egg(Chicken mother) { + this.mother = mother; + } + + public Chicken getMother() { + return mother; + } + } \ No newline at end of file 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 ba868b7fc9..458f37e59c 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,6 @@ import jakarta.enterprise.inject.UnsatisfiedResolutionException; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/GrannySmithAppleTree.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/GrannySmithAppleTree.java index 83ed6933f1..b4d1e246a6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/GrannySmithAppleTree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/GrannySmithAppleTree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java index a14ef3b7fe..26cb6e1114 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface LightYellow { - +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface LightYellow { + } \ No newline at end of file diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java index 76e271e32c..cac978afd3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTreeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTreeLocal.java index ebcbfe4d90..64f989db7b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTreeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTreeLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Pear.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Pear.java index 2db1c5e996..bb5f167898 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Pear.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/Pear.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java index 95df0adf27..5586b48e49 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java index 95a6789d81..2176dbf36b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/YellowPearTree.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/YellowPearTree.java index 3e281aafdc..4cce8d66ab 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/YellowPearTree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/producer/method/definition/enterprise/YellowPearTree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 42689e1c82..2791da7086 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Yummy { - class Literal extends AnnotationLiteral implements Yummy { - } +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.producer.method.definition.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/definition/ee/EnterpriseBeanObserver.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/EnterpriseBeanObserver.java index d5453f1827..69ff24d7cf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/EnterpriseBeanObserver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/EnterpriseBeanObserver.java @@ -16,6 +16,7 @@ import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.spi.Extension; import jakarta.enterprise.inject.spi.ProcessManagedBean; + import org.jboss.cdi.tck.tests.implementation.simple.definition.Sheep; public class EnterpriseBeanObserver implements Extension { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockEnterpriseBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockEnterpriseBean.java index 7ae910b64b..2e6e1fc587 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockEnterpriseBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockEnterpriseBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,8 +23,8 @@ public class MockEnterpriseBean { /** - * - */ + * + */ private static final long serialVersionUID = -2903748486907540813L; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServlet.java index c5ba1f8df1..1e1918bd44 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletContextListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletContextListener.java index e37e5917a9..7d376ea7b6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletContextListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletContextListener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletRequestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletRequestListener.java index f4ff48d77f..4e79f86157 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletRequestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockServletRequestListener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockUIComponent.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockUIComponent.java index ef5ad2ddfd..4f0dc7502c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockUIComponent.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/definition/ee/MockUIComponent.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Ping.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Ping.java index f83eb18087..dcb231a9cf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Ping.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Ping.java @@ -21,7 +21,6 @@ public class Ping { private String testServletId; - @Inject IntrospectServlet servlet; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Tame.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Tame.java index 4e66f8ab45..360977dece 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Tame.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Tame.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Wild.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Wild.java index e21b84ee8e..5245308e76 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Wild.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/ee/components/Wild.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/name/Another.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/name/Another.java index 36082023f0..56a63ce499 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/name/Another.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/name/Another.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.resource.broken.name; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Another { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.resource.broken.name; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Another { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/Another.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/Another.java index 3084913b6c..89a4691340 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/Another.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/Another.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.resource.broken.type; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Another { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.resource.broken.type; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Another { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Bean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Bean.java index ccfda88ad0..bd7528f9cd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Bean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Bean.java @@ -15,7 +15,7 @@ import jakarta.ejb.Stateful; -@Stateful(name="Bean") +@Stateful(name = "Bean") public class Bean implements BeanRemote { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/BeanRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/BeanRemote.java index a7b6e226dd..72dbdb19b9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/BeanRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/BeanRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Lazy.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Lazy.java index a8d7d98f62..731f51e399 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Lazy.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/Lazy.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.resource.broken.type.ejb; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Lazy { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.resource.broken.type.ejb; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Lazy { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceDefinitionWithDifferentTypeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceDefinitionWithDifferentTypeTest.java index b1aa3f3ffd..1ec52a0486 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceDefinitionWithDifferentTypeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceDefinitionWithDifferentTypeTest.java @@ -37,7 +37,8 @@ public class ResourceDefinitionWithDifferentTypeTest extends AbstractTest { @ShouldThrowException(DefinitionException.class) @Deployment public static WebArchive createTestArchive() { - return new WebArchiveBuilder().withName("ResourceDefinitionWithDifferentTypeTestEJB.war").withTestClassPackage(ResourceDefinitionWithDifferentTypeTest.class).build(); + return new WebArchiveBuilder().withName("ResourceDefinitionWithDifferentTypeTestEJB.war") + .withTestClassPackage(ResourceDefinitionWithDifferentTypeTest.class).build(); } @Test(groups = JAVAEE_FULL) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceProducer.java index a2fdace3d8..9df80273b1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/ejb/ResourceProducer.java @@ -21,7 +21,7 @@ public class ResourceProducer { @Produces - @EJB(lookup="java:global/ResourceDefinitionWithDifferentTypeTestEJB/Bean!org.jboss.cdi.tck.tests.implementation.simple.resource.broken.type.ejb.BeanRemote") + @EJB(lookup = "java:global/ResourceDefinitionWithDifferentTypeTestEJB/Bean!org.jboss.cdi.tck.tests.implementation.simple.resource.broken.type.ejb.BeanRemote") @Lazy Integer remoteBean; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/Greeting.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/Greeting.java index 40f0d9207b..07764b157b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/Greeting.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/Greeting.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceDefinitionWithDifferentTypeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceDefinitionWithDifferentTypeTest.java index 0478c6bdfb..fdc248cdd3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceDefinitionWithDifferentTypeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceDefinitionWithDifferentTypeTest.java @@ -43,7 +43,8 @@ public static WebArchive createTestArchive() { .withTestClassPackage(ResourceDefinitionWithDifferentTypeTest.class) .withWebXml( Descriptors.create(WebAppDescriptor.class).createEnvEntry().envEntryName("greeting") - .envEntryType("java.lang.String").envEntryValue("Hello!").up()).build(); + .envEntryType("java.lang.String").envEntryValue("Hello!").up()) + .build(); } @Test(groups = INTEGRATION) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceProducer.java index c7ce149075..9dfe363fcc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/env/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/Database.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/Database.java index 9d001e3dcc..a7cfcc02d5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/Database.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/Database.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/ResourceProducer.java index 54e54a04a3..08366bed41 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/context/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/Database.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/Database.java index 4d5549287b..3db6e74e72 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/Database.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/Database.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/ResourceProducer.java index 7cd9bfb952..50e98c7f4f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/broken/type/persistence/unit/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/AnotherInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/AnotherInterface.java index 426a452074..b86e12eedc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/AnotherInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/AnotherInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Bean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Bean.java index f15e1c8cf9..fef36d85e9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Bean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Bean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -28,11 +28,9 @@ public class Bean implements BeanRemote { private int knocks = 0; - private @Inject - Monitor monitor; + private @Inject Monitor monitor; - private @Resource - UserTransaction transaction; + private @Resource UserTransaction transaction; public String knockKnock() { knocks++; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/BeanRemote.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/BeanRemote.java index 6733279389..c9cb3e253b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/BeanRemote.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/BeanRemote.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 85b35285ae..ac6aee568a 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 @@ -21,7 +21,6 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -46,7 +45,8 @@ public static WebArchive createTestArchive() { } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "ee"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "ld"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "ee"), + @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "ld"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "mg") }) public void testInjectionOfEjbs() { Bean managedBean = getBeans(ManagedBean.class).iterator().next(); 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 5d5af04b86..a7af3770f5 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.resource.ejb; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Lazy { - class Literal extends AnnotationLiteral implements Lazy { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.resource.ejb; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/ejb/ManagedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/ManagedBean.java index 3cca2b6af0..ed2ef2f831 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/ManagedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/ManagedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Monitor.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Monitor.java index d3906579da..5144a31b65 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Monitor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/Monitor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -20,8 +20,8 @@ @RequestScoped public class Monitor implements Serializable { /** - * - */ + * + */ private static final long serialVersionUID = 4495864336368063408L; private boolean remoteEjbDestroyed = false; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java index c13e74845a..b4ebd5215e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Bean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Bean.java index 2160257cf0..0ddb0dbf87 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Bean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Bean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Lazy.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Lazy.java index 610e6c3861..f8b35f1b22 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Lazy.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/Lazy.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.resource.ejb.staticProducer; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Lazy { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.resource.ejb.staticProducer; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Lazy { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ManagedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ManagedBean.java index 00d6680ac4..f18769b686 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ManagedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ManagedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ResourceProducer.java index 1d835054b7..698efe6871 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/ejb/staticProducer/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 65f0f32ad6..75b2b5e76c 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -23,7 +23,6 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -36,7 +35,7 @@ /** * Environment variable injection tests for simple beans. - * + * * @author Dan Allen */ @Test(groups = INTEGRATION) @@ -60,7 +59,8 @@ public void testInjectionOfEnv() { } @Test - @SpecAssertions({ @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "la"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "ma"), + @SpecAssertions({ @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "la"), + @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "ma"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "o") }) public void testProduceEnvProxy() { @SuppressWarnings("serial") @@ -85,7 +85,8 @@ public void testResourceBeanTypes() { Class[] expectedClasses = new Class[classes.size()]; classes.toArray(expectedClasses); - assert check.getTypes().size() == expectedClasses.length : "Bean has "+expectedClasses.length+" types: "+check.getTypes(); - assert rawTypeSetMatches(check.getTypes(), expectedClasses) : "Expected classes are: "+classes; + assert check.getTypes().size() == expectedClasses.length + : "Bean has " + expectedClasses.length + " types: " + check.getTypes(); + assert rawTypeSetMatches(check.getTypes(), expectedClasses) : "Expected classes are: " + classes; } } 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 ccb1472485..bc7342fc14 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/GreetingBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/GreetingBean.java index 8497dd6dab..1d63cf0df8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/GreetingBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/GreetingBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/ResourceProducer.java index bccab19910..e901fb63bf 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/EnvInjectionStaticProducerFieldTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/EnvInjectionStaticProducerFieldTest.java index 649fdbdb3f..88865b7067 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/EnvInjectionStaticProducerFieldTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/EnvInjectionStaticProducerFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -40,9 +40,9 @@ public static WebArchive createTestArchive() { Descriptors .create(WebAppDescriptor.class) .createEnvEntry() - .envEntryName("greeting") - .envEntryType("java.lang.String") - .envEntryValue("Hello there my friend").up()) + .envEntryName("greeting") + .envEntryType("java.lang.String") + .envEntryValue("Hello there my friend").up()) .build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/Greeting.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/Greeting.java index de041e583b..41c2c24748 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/Greeting.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/Greeting.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/GreetingBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/GreetingBean.java index 1300babfcc..4fbd3f8410 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/GreetingBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/GreetingBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/ResourceProducer.java index c3092762f8..7b00dcb53e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/env/staticProducer/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 4f61c74d16..2a4021ccd7 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java index 4a52764fb2..4fb2478c10 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 1ee83e8994..cee0ffef9c 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 @@ -22,7 +22,6 @@ import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; @@ -52,7 +51,8 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "cc"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "lb"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "cc"), + @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "lb"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "mc") }) public void testInjectionOfPersistenceContext() { ServiceBean serviceBean = getContextualReference(ServiceBean.class); @@ -62,7 +62,8 @@ public void testInjectionOfPersistenceContext() { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "dd"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "lc"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "dd"), + @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "lc"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "me") }) public void testInjectionOfPersistenceUnit() { Bean managedBeanBean = getBeans(ManagedBean.class).iterator().next(); @@ -84,7 +85,8 @@ public void testPassivationOfPersistenceContext() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "lc"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "mf") }) + @SpecAssertions({ @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "lc"), + @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "mf") }) public void testPassivationOfPersistenceUnit() throws Exception { Bean managedBeanBean = getBeans(ManagedBean.class).iterator().next(); CreationalContext managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean); @@ -95,7 +97,8 @@ public void testPassivationOfPersistenceUnit() throws Exception { } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "hh"), @SpecAssertion(section = RESOURCE_TYPES, id = "ab") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_RESOURCE, id = "hh"), + @SpecAssertion(section = RESOURCE_TYPES, id = "ab") }) public void testBeanTypesAndBindingTypesOfPersistenceContext() { Bean manager = getBeans(EntityManager.class, new Database.Literal()).iterator().next(); assert manager.getTypes().size() == 3; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ResourceProducer.java index b6270c1468..a88734c605 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/Database.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/Database.java index d0068e3146..f52b951d2f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/Database.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/Database.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ManagedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ManagedBean.java index 8753509f4b..eb123d7f21 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ManagedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ManagedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/PersistenceInjectionStaticProducerFieldTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/PersistenceInjectionStaticProducerFieldTest.java index e6d242f2c4..eef87f3bca 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/PersistenceInjectionStaticProducerFieldTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/PersistenceInjectionStaticProducerFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -30,7 +30,7 @@ /** * Test producer fields with injection of persistence related objects. - * + * * @author David Allen * @author Martin Kouba */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ResourceProducer.java index 5c36a784ff..34e1cc8a28 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ResourceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/persistenceContext/staticProducer/ResourceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 f715ac63da..cc8ccb6d9b 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.resource.resource; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Another { - class Literal extends AnnotationLiteral implements Another { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.resource.resource; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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 5204006eda..26f750ef4a 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,6 @@ import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanContainer; import jakarta.enterprise.inject.spi.BeanManager; -import jakarta.enterprise.util.AnnotationLiteral; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; @@ -52,7 +51,8 @@ public void testInjectionOfResource() { } @Test - @SpecAssertions({ @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "la"), @SpecAssertion(section = RESOURCE_LIFECYCLE, id = "ma"), + @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 Another.Literal()).iterator().next(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/ManagedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/ManagedBean.java index 79f510cb27..95cdb5181f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/ManagedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/ManagedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/Another.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/Another.java index 76789498ce..7a476999ae 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/Another.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/Another.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.implementation.simple.resource.resource.staticProducer; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Another { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.implementation.simple.resource.resource.staticProducer; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Another { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/InjectionOfResourceStaticProducerFieldTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/InjectionOfResourceStaticProducerFieldTest.java index 2621a9514f..c2edc620d3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/InjectionOfResourceStaticProducerFieldTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/InjectionOfResourceStaticProducerFieldTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/ManagedBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/ManagedBean.java index e6f6eddb9c..9d98983069 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/ManagedBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/implementation/simple/resource/resource/staticProducer/ManagedBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/AppleEjb.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/AppleEjb.java index 1177df9770..fd64c5d30d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/AppleEjb.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/AppleEjb.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Cheap.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Cheap.java index 020f64d410..e298cbb82f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Cheap.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Cheap.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Citrus.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Citrus.java index ec1a1e1fc1..92a54711ac 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Citrus.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Citrus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/CitrusEjb.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/CitrusEjb.java index 20bd517c6c..1e37b0056b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/CitrusEjb.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/CitrusEjb.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Expensive.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Expensive.java index fd11225567..3e0dcee153 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Expensive.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Expensive.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FirstLevel.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FirstLevel.java index 13fe20904a..5499184a7a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FirstLevel.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FirstLevel.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Fruit.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Fruit.java index bdbb8f73a7..ad3b4617c0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Fruit.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Fruit.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FruitEjb.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FruitEjb.java index 8b9dac2492..d08e1789a7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FruitEjb.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/FruitEjb.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/InitializerMethodInheritanceTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/InitializerMethodInheritanceTest.java index 40272a7d01..1c5b8bedc9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/InitializerMethodInheritanceTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/InitializerMethodInheritanceTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -33,7 +33,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @Test(groups = INTEGRATION) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Lemon.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Lemon.java index 64dc32a592..2cb471a808 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Lemon.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Lemon.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Orange.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Orange.java index 4988f32f83..360f4eca54 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Orange.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/Orange.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/OrangeEjb.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/OrangeEjb.java index e6a88f7fb2..83d15df975 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/OrangeEjb.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/OrangeEjb.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/PriceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/PriceProducer.java index 46d4872416..83f4d3ebce 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/PriceProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/PriceProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/SecondLevel.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/SecondLevel.java index 8703cca93a..1be3d08f63 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/SecondLevel.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/initializer/SecondLevel.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Animal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Animal.java index 0c360bd991..81aeb82eb0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Animal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Animal.java @@ -1,18 +1,18 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise; - -public interface Animal { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise; + +public interface Animal { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Building.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Building.java index 2f36ae468d..874b1b450d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Building.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Building.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java index 8a36fbee1a..32d598606c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/BuildingLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d142f248ce..bf44e8b94c 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -25,7 +25,6 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Named; import org.jboss.arquillian.container.test.api.Deployment; @@ -49,7 +48,8 @@ public static WebArchive createTestArchive() { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION_EE, id = "ia"), @SpecAssertion(section = SPECIALIZE_SESSION_BEAN, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION_EE, id = "ia"), + @SpecAssertion(section = SPECIALIZE_SESSION_BEAN, id = "aa") }) public void testDirectSpecialization() { Set> farmerBeans = getBeans(LazyFarmerLocal.class, LANDOWNER_LITERAL); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java index 465b0a50bd..4742f7e66b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmEquipment.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Farmer.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Farmer.java index cacb206231..759875f5e0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Farmer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Farmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java index 0b8c7c6867..f2a951b328 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/FarmerLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 7e270d8a96..7b99809fa7 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Landowner { - class Literal extends AnnotationLiteral implements Landowner { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/enterprise/Lazy.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Lazy.java index 00f34a3c43..12b6f477c3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Lazy.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Lazy.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Lazy { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Lazy { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java index 7b343258bf..110a92bfc2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java index 126828a21e..2fd0f6c3a7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/LazyFarmerLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Office.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Office.java index accc960381..8b975b0a9a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Office.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Office.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java index 769ec76f32..1a1067d04c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/OfficeLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/TractorLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/TractorLocal.java index 5ee47b9f95..a7f442609f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/TractorLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/TractorLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Waste.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Waste.java index 2bb0ca6203..7332feeb33 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Waste.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Waste.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Yard.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Yard.java index 46f938740b..3cf9b0cdf3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Yard.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/Yard.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/YardInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/YardInterface.java index 3b57a407c8..3a0c24ed0a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/YardInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/YardInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/DirectlyExtendsSimpleBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/DirectlyExtendsSimpleBeanTest.java index c2a5172aba..743a163ec5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/DirectlyExtendsSimpleBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/DirectlyExtendsSimpleBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -36,7 +36,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(DirectlyExtendsSimpleBeanTest.class).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = SPECIALIZE_SESSION_BEAN, id = "da") public void testSpecializingClassDirectlyExtendsSimpleBean() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/FarmEquipment.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/FarmEquipment.java index ab10023015..1874a86d63 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/FarmEquipment.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/FarmEquipment.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/TractorLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/TractorLocal.java index 9cc8232c56..40715310fe 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/TractorLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/TractorLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/Tractor_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/Tractor_Broken.java index 170a3df915..994ba16b91 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/Tractor_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/managedbean/Tractor_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/CowLocal_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/CowLocal_Broken.java index c00df1d615..3a2673d71a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/CowLocal_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/CowLocal_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/Cow_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/Cow_Broken.java index 825c39b3a7..397d4fa632 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/Cow_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/Cow_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/DirectlyExtendsNothingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/DirectlyExtendsNothingTest.java index 6075210c73..b174e6691a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/DirectlyExtendsNothingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/nothing/DirectlyExtendsNothingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -36,7 +36,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(DirectlyExtendsNothingTest.class).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = SPECIALIZE_SESSION_BEAN, id = "da") public void testSpecializingClassDirectlyExtendsNothing() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/Mock.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/Mock.java index 5af1a9a26a..3ff841709c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/Mock.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/Mock.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise.broken.extend.sessionbean; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Mock { -} +package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise.broken.extend.sessionbean; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Mock { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/SessionBeanSpecializingSessionBeanWithClientViewTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/SessionBeanSpecializingSessionBeanWithClientViewTest.java index 05dd402262..9f42c66b82 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/SessionBeanSpecializingSessionBeanWithClientViewTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/extend/sessionbean/SessionBeanSpecializingSessionBeanWithClientViewTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -31,7 +31,7 @@ * Bean types of LoginActionBean are LoginAction, Object (all local interfaces of the bean and their superinterfaces). * Bean types of MockLoginActionBean are MockLoginActionBean, LoginActionBean, Object (the bean class and all superclasses). * Specializing bean must have all bean types of the specialized bean. - * + * * @author Matus Abaffy */ @SpecVersion(spec = "cdi", version = "2.0") @@ -43,7 +43,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(SessionBeanSpecializingSessionBeanWithClientViewTest.class).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "l") public void testDeployment() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/FarmYard_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/FarmYard_Broken.java index eda087797f..e10b5947e1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/FarmYard_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/FarmYard_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/Yard.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/Yard.java index f894d92a5e..2d77b9c918 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/Yard.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/Yard.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/YardInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/YardInterface.java index f1a296e7da..2b3f4067dc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/YardInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/name/YardInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Farmer.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Farmer.java index d084a05992..96755b9bc9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Farmer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Farmer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FarmerInterface.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FarmerInterface.java index 98c49c2c95..b55e399d5d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FarmerInterface.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FarmerInterface.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FishFarmer_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FishFarmer_Broken.java index ececdd87df..8954d2fb1a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FishFarmer_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/FishFarmer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Landowner.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Landowner.java index ba0a347ecd..24be892bf9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Landowner.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/Landowner.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise.broken.twobeans; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Landowner { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.inheritance.specialization.enterprise.broken.twobeans; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Landowner { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/SheepFarmer_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/SheepFarmer_Broken.java index b59338bd9c..78e07eb860 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/SheepFarmer_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/SheepFarmer_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java index 7fbb36288e..96c59ee503 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/enterprise/broken/twobeans/TwoBeansSpecializeTheSameBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 d80cc2b6b1..807eadf005 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 @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -27,7 +27,6 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.spi.Bean; -import jakarta.enterprise.util.AnnotationLiteral; import jakarta.inject.Named; import org.jboss.arquillian.container.test.api.Deployment; @@ -55,7 +54,8 @@ public static WebArchive createTestArchive() { @SuppressWarnings("unchecked") @Test - @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION_EE, id = "ia"), @SpecAssertion(section = DECLARING_PRODUCER_METHOD_EE, id = "c"), + @SpecAssertions({ @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION_EE, id = "ia"), + @SpecAssertion(section = DECLARING_PRODUCER_METHOD_EE, id = "c"), @SpecAssertion(section = PRODUCER_METHOD_EE, id = "aa") }) public void testSpecializingProducerMethod() { 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 c04983f1b3..7cb8dae91e 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.inheritance.specialization.producer.method.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Expensive { - class Literal extends AnnotationLiteral implements Expensive { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.inheritance.specialization.producer.method.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@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/JewelryShop.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/JewelryShop.java index e5a55ad634..3279a821fa 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/JewelryShop.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/JewelryShop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Necklace.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Necklace.java index 79fde89b56..cf1c47e696 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Necklace.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Necklace.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Product.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Product.java index 46efecc275..08b1883b3e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Product.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Product.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Shop.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Shop.java index cd558e46d2..429d4e38ff 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Shop.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/producer/method/enterprise/Shop.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. 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 4c0adb0c12..f5bd63ce33 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 @@ -1,36 +1,36 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.inheritance.specialization.producer.method.enterprise; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -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) -@Documented -@Qualifier -public @interface Sparkly { - class Literal extends AnnotationLiteral implements Sparkly { - } -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.inheritance.specialization.producer.method.enterprise; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +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) +@Documented +@Qualifier +public @interface Sparkly { + class Literal extends AnnotationLiteral implements Sparkly { + } +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java index 5cabd7a83f..61e79cb944 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipment.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java index f44b5c05fd..bf9f8842e8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/FarmEquipmentLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java index 02e8ed00c7..a1eac58ed3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/SpecializingBeanExtendsEnterpriseBeanTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -36,7 +36,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClassPackage(SpecializingBeanExtendsEnterpriseBeanTest.class).build(); } - @Test(groups = INTEGRATION) + @Test(groups = INTEGRATION) @SpecAssertion(section = SPECIALIZE_SESSION_BEAN, id = "da") public void testSpecializingClassDirectlyExtendsEnterpriseBean() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java index 53f1653881..fdf6a04184 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalClassMethodLevelInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalClassMethodLevelInterceptorTest.java index f6967f2fee..d346db3ded 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalClassMethodLevelInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalClassMethodLevelInterceptorTest.java @@ -16,6 +16,7 @@ import static org.jboss.cdi.tck.cdi.Sections.BINDING_INTERCEPTOR_TO_BEAN; import jakarta.enterprise.inject.spi.DeploymentException; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.cdi.tck.AbstractTest; @@ -43,7 +44,8 @@ public class FinalClassMethodLevelInterceptorTest extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(FinalClassMethodLevelInterceptorTest.class) - .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassMethodLevelMissile.class, FinalClassMethodLevelIPBean.class) + .withClasses(FooBinding.class, MissileInterceptor.class, FinalClassMethodLevelMissile.class, + FinalClassMethodLevelIPBean.class) .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)).build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelInterceptorTest.java index 6d29b323a3..944a2d43f1 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelInterceptorTest.java @@ -45,7 +45,7 @@ public static WebArchive createTestArchive() { .withClasses(FooBinding.class, MissileInterceptor.class, FinalMethodClassLevelMissile.class, FinalMethodClassLevelMissileLocal.class) .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class) - .setBeansXmlVersion(BeansXmlVersion.v11) + .setBeansXmlVersion(BeansXmlVersion.v11) ) .build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissile.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissile.java index 65e7291267..335b1f8da4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissile.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor.ee; import jakarta.ejb.Stateful; + import org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor.FooBinding; @Stateful diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissileLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissileLocal.java index 5b5ed45b21..06cfb3f10e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissileLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodClassLevelMissileLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelInterceptorTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelInterceptorTest.java index a57d2778cc..f9ebc09e83 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelInterceptorTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelInterceptorTest.java @@ -42,7 +42,7 @@ public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClassDefinition(FinalMethodMethodLevelInterceptorTest.class) .withClasses(FooBinding.class, MissileInterceptor.class, FinalMethodMethodLevelMissile.class, - FinalMethodMethodLevelMissileLocal.class) + FinalMethodMethodLevelMissileLocal.class) .withBeansXml(new BeansXml().interceptors(MissileInterceptor.class)) .build(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissile.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissile.java index fc6268ec07..5fe0a768bc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissile.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor.ee; import jakarta.ejb.Stateful; + import org.jboss.cdi.tck.tests.interceptors.definition.broken.finalClassInterceptor.FooBinding; @Stateful diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissileLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissileLocal.java index c6a8475ba3..66abc4f21b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissileLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/broken/finalClassInterceptor/ee/FinalMethodMethodLevelMissileLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java index f5420053ff..71848f54fd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java index f5ac1a4a52..42480a137e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java index 2807502979..03ee670efb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java index fb4d26f376..ef65e1874b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java index c2690195f3..a40f98935e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java index 6e06b7c27c..13befdff72 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java @@ -41,7 +41,7 @@ public static WebArchive createTestArchive() { @Test(groups = INTEGRATION, dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "g"), - @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "h") }) + @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "h") }) public void testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding(MissileLocal missile) { assertNotNull(missile); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java index c0c03dbcf5..85c77f6d8e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MessageDrivenBeanInterceptorInvocationTest.java @@ -20,12 +20,15 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.util.concurrent.TimeUnit; + import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.impl.ConfigurationFactory; -import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.descriptors.ejb.EjbJarDescriptorBuilder; +import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.ejbjar31.EjbJarDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; @@ -34,8 +37,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.concurrent.TimeUnit; - /** * Test that invocations of message listener methods of message-driven beans during message delivery are business method * invocations. @@ -54,7 +55,8 @@ public static WebArchive createTestArchive() { newMessageDriven("TestQueue", MessageDrivenMissile.class.getName()) .addActivationConfigProperty("acknowledgeMode", "Auto-acknowledge") .addActivationConfigProperty("destinationType", "jakarta.jms.Queue") - .addActivationConfigProperty("destinationLookup", ConfigurationFactory.get().getTestJmsQueue())).build(); + .addActivationConfigProperty("destinationLookup", ConfigurationFactory.get().getTestJmsQueue())) + .build(); return new WebArchiveBuilder() .withTestClassPackage(MessageDrivenBeanInterceptorInvocationTest.class) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/Missile.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/Missile.java index 4907c466b9..f88b3dc6ea 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/Missile.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MissileInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MissileInterceptor.java index b694363664..576d7a8046 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MissileInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -29,13 +29,13 @@ public class MissileInterceptor { public static boolean lifecycleCallbackIntercepted = false; public static boolean aroundConstructInterceptorCalled = false; - + @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception { METHOD_INTERCEPTED.set(true); return ctx.proceed(); } - + @AroundConstruct public Object aroundConstruct(InvocationContext ctx) throws Exception { aroundConstructInterceptorCalled = true; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/SimpleMessageProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/SimpleMessageProducer.java index 5981cf5026..c10aa42edc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/SimpleMessageProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/jms/SimpleMessageProducer.java @@ -41,7 +41,8 @@ public class SimpleMessageProducer { @PostConstruct public void init() { - this.connectionFactory = (ConnectionFactory) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsConnectionFactory()); + this.connectionFactory = (ConnectionFactory) JndiLookupUtils + .lookup(ConfigurationFactory.get().getTestJmsConnectionFactory()); this.queue = (Queue) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsQueue()); this.topic = (Topic) JndiLookupUtils.lookup(ConfigurationFactory.get().getTestJmsTopic()); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Airborne.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Airborne.java index 67be2e5b6a..983b8fc068 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Airborne.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Airborne.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Anchor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Anchor.java index fe9704a161..4520cf1535 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Anchor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Anchor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/AnchorInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/AnchorInterceptor.java index a21ae63d10..6b2d4a7dc2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/AnchorInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/AnchorInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Cruiser.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Cruiser.java index 15921eb1b3..ec6b118f8e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Cruiser.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Cruiser.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Missile.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Missile.java index 3893f5ad3e..8094086e96 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Missile.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileInterceptor.java index 5efb4b2e41..515000fff3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileLocal.java index 855c999fa0..51619dc178 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java index c4821eff5c..4f5ed2b34f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Waterborne.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Waterborne.java index 491332de11..6dffc4b041 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Waterborne.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/nonContextualReference/Waterborne.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java index e0a298a3da..18a189ff57 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java index 66e67b5c12..9e04fa9758 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java index 92c521fbc7..0a99862a17 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java index c018ec6368..6a1dcd6ab3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java index 3c4f20b398..5e163983d9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java @@ -20,6 +20,7 @@ import static org.testng.Assert.assertTrue; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Cactus.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Cactus.java index 0779d1b3d6..03bd938956 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Cactus.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Cactus.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Culinary.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Culinary.java index 1c2c1ceed2..82be690241 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Culinary.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Culinary.java @@ -6,24 +6,24 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.interceptors.definition.inheritance_ee; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/European.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/European.java index 3debb96927..5ff2d3f9d0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/European.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/European.java @@ -6,24 +6,24 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.interceptors.definition.inheritance_ee; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + @Target({ TYPE, METHOD, PARAMETER, FIELD }) @Retention(RUNTIME) @Qualifier diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Flower.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Flower.java index eeb0dfb844..7857e4dea4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Flower.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Flower.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/ForgetMeNot.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/ForgetMeNot.java index 7c307e9b7c..daed7c93a0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/ForgetMeNot.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/ForgetMeNot.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedBySquirrel.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedBySquirrel.java index bd730d69af..465dae60ff 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedBySquirrel.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedBySquirrel.java @@ -6,13 +6,17 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.interceptors.definition.inheritance_ee; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -20,14 +24,10 @@ import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Inherited @Documented @InterceptorBinding public @interface GuardedBySquirrel { -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedByWoodpecker.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedByWoodpecker.java index a751956dbd..0cf43c9d03 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedByWoodpecker.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/GuardedByWoodpecker.java @@ -6,26 +6,26 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.interceptors.definition.inheritance_ee; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; import jakarta.interceptor.InterceptorBinding; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented @InterceptorBinding public @interface GuardedByWoodpecker { -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/InterceptorBindingInheritanceTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/InterceptorBindingInheritanceTest.java index 3b0738e438..936c56c53c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/InterceptorBindingInheritanceTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/InterceptorBindingInheritanceTest.java @@ -6,13 +6,20 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.interceptors.definition.inheritance_ee; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.MEMBER_LEVEL_INHERITANCE; +import static org.jboss.cdi.tck.cdi.Sections.MEMBER_LEVEL_INHERITANCE_EE; +import static org.jboss.cdi.tck.cdi.Sections.TYPE_LEVEL_INHERITANCE_EE; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -24,17 +31,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.MEMBER_LEVEL_INHERITANCE; -import static org.jboss.cdi.tck.cdi.Sections.MEMBER_LEVEL_INHERITANCE_EE; -import static org.jboss.cdi.tck.cdi.Sections.TYPE_LEVEL_INHERITANCE; -import static org.jboss.cdi.tck.cdi.Sections.TYPE_LEVEL_INHERITANCE_EE; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - /** * Test interceptor binding inheritance. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -52,9 +51,9 @@ public static WebArchive createTestArchive() { private String squirrel = SquirrelInterceptor.class.getName(); private String woodpecker = WoodpeckerInterceptor.class.getName(); - @Test(groups = INTEGRATION, dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "an"), @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "ana") }) + @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "an"), + @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "ana") }) public void testInterceptorBindingDirectlyInheritedFromSessionBean(ForgetMeNot forgetMeNot) throws Exception { forgetMeNot.pong(); assertTrue(forgetMeNot.inspectedBy(squirrel)); @@ -62,7 +61,8 @@ public void testInterceptorBindingDirectlyInheritedFromSessionBean(ForgetMeNot f } @Test(groups = INTEGRATION, dataProvider = ARQUILLIAN_DATA_PROVIDER) - @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "ar"), @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "ara") }) + @SpecAssertions({ @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "ar"), + @SpecAssertion(section = TYPE_LEVEL_INHERITANCE_EE, id = "ara") }) public void testInterceptorBindingIndirectlyInheritedFromSessionBean(@European ForgetMeNot woodForgetMeNot) throws Exception { woodForgetMeNot.pong(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Opuncia.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Opuncia.java index 30dfa28fb9..a0235d3893 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Opuncia.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Opuncia.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Ping.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Ping.java index cffef351b8..544670141f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Ping.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Ping.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Plant.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Plant.java index f89a394357..276e8d7387 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Plant.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Plant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/PongPlant.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/PongPlant.java index 0002aee800..6558d6c329 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/PongPlant.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/PongPlant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Shrub.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Shrub.java index edbefce0ce..d282b3877c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Shrub.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Shrub.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/SquirrelInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/SquirrelInterceptor.java index 7d89b96fad..fa73cd760e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/SquirrelInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/SquirrelInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Tree.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Tree.java index a720004167..77445e1039 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Tree.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/Tree.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodForgetMeNot.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodForgetMeNot.java index 15dc313112..7dff5aba87 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodForgetMeNot.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodForgetMeNot.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodpeckerInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodpeckerInterceptor.java index 0079427e01..d4442b422f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodpeckerInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/inheritance_ee/WoodpeckerInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Airborne.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Airborne.java index 843ac3db81..251b335cf9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Airborne.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Airborne.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/AnotherInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/AnotherInterceptor.java index fb6a6aa2f9..54415794e8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/AnotherInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/AnotherInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java index 9d68e28edb..aa87923dde 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/EnterpriseLifecycleInterceptorDefinitionTest.java @@ -17,8 +17,11 @@ import static org.jboss.cdi.tck.cdi.Sections.ENABLED_INTERCEPTORS; import static org.testng.Assert.assertEquals; +import java.util.List; + import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.spi.Bean; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -30,8 +33,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.List; - @SpecVersion(spec = "cdi", version = "2.0") public class EnterpriseLifecycleInterceptorDefinitionTest extends AbstractTest { @@ -46,7 +47,7 @@ public static WebArchive createTestArchive() { @Test(groups = INTEGRATION) @SpecAssertions({ @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "g"), - @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "h") }) + @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "h") }) public void testLifecycleInterception() { ActionSequence.reset(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Missile.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Missile.java index e00554015c..6454f63827 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Missile.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/Missile.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/MissileInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/MissileInterceptor.java index f5aeff2349..dc5dd38d31 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/MissileInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/definition/lifecycle/enterprise/order/MissileInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/InterceptorInvocationTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/InterceptorInvocationTest.java index 661ce2211e..fa23c11b18 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/InterceptorInvocationTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/InterceptorInvocationTest.java @@ -13,6 +13,11 @@ */ package org.jboss.cdi.tck.tests.interceptors.ejb; +import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; +import static org.jboss.cdi.tck.cdi.Sections.BIZ_METHOD_EE; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import java.util.concurrent.TimeUnit; import org.jboss.arquillian.container.test.api.Deployment; @@ -28,11 +33,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.JAVAEE_FULL; -import static org.jboss.cdi.tck.cdi.Sections.BIZ_METHOD_EE; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; - /** * * @author Martin Kouba diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/Timing.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/Timing.java index 1556c990df..63642c0790 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/Timing.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ejb/Timing.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -18,6 +18,7 @@ import jakarta.ejb.Stateless; import jakarta.ejb.Timeout; import jakarta.ejb.Timer; + import org.jboss.cdi.tck.tests.interceptors.invocation.AlmightyBinding; @AlmightyBinding diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java index b6363522d6..bf571ffa15 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/EnterpriseInterceptorOrderingTest.java @@ -32,7 +32,6 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; @@ -82,7 +81,8 @@ public static EnterpriseArchive createTestArchive() { //D JavaArchive ejbArchive = ShrinkWrap .create(JavaArchive.class, ejbJar) - .addClasses(DummyDao.class, GloballyEnabledInterceptor2.class, GloballyEnabledInterceptor5.class, LegacyInterceptor3.class) + .addClasses(DummyDao.class, GloballyEnabledInterceptor2.class, GloballyEnabledInterceptor5.class, + LegacyInterceptor3.class) .addAsManifestResource(new BeansXml().interceptors(LegacyInterceptor3.class), "beans.xml") .setManifest( new StringAsset(Descriptors.create(ManifestDescriptor.class) @@ -94,7 +94,8 @@ public static EnterpriseArchive createTestArchive() { WebArchive webArchive = new WebArchiveBuilder() .notTestArchive() //F - .withClasses(EnterpriseInterceptorOrderingTest.class, GloballyEnabledInterceptor1.class, LegacyInterceptor1.class) + .withClasses(EnterpriseInterceptorOrderingTest.class, GloballyEnabledInterceptor1.class, + LegacyInterceptor1.class) .withBeansXml(new BeansXml().interceptors(LegacyInterceptor1.class)) //G .withBeanLibrary(GloballyEnabledInterceptor4.class) @@ -111,7 +112,7 @@ public static EnterpriseArchive createTestArchive() { @Test(groups = JAVAEE_FULL, dataProvider = ARQUILLIAN_DATA_PROVIDER) @SpecAssertions({ @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "f"), - @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "i") }) + @SpecAssertion(section = ENABLED_INTERCEPTORS, id = "i") }) public void testDecoratorsInWebInfClasses(Dao dao) { assertNotNull(dao); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java index ceeb4d2e22..7393fc33b7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/interceptors/ordering/global/GlobalInterceptorOrderingTest.java @@ -19,6 +19,9 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import java.util.ArrayList; +import java.util.List; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -30,9 +33,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.List; - /** * Test interceptor enablement and ordering. * @@ -48,7 +48,8 @@ public static WebArchive createTestArchive() { // WEB-INF/classes .withClasses(Dao.class, LegacyInterceptor1.class, LegacyInterceptor2.class, LegacyInterceptor3.class, WebApplicationGlobalInterceptor1.class) - .withBeansXml(new BeansXml().interceptors(LegacyInterceptor1.class, LegacyInterceptor2.class, LegacyInterceptor3.class)) + .withBeansXml(new BeansXml().interceptors(LegacyInterceptor1.class, LegacyInterceptor2.class, + LegacyInterceptor3.class)) .withBeanLibrary(Transactional.class, AbstractInterceptor.class, Service.class, GloballyEnabledInterceptor1.class, GloballyEnabledInterceptor3.class, GloballyEnabledInterceptor4.class, GloballyEnabledInterceptor5.class) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Car.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Car.java index 293e5ee32e..3e6ccc00a4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Car.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Car.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java index 4769769cc0..a63fbdebc5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/ClientProxyTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Garage.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Garage.java index 90e451b563..59380a3a92 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Garage.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/Garage.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/TestServlet.java index 58293f0c98..fdce6e6670 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/incontainer/TestServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/ClientProxyTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/ClientProxyTest.java index 797ec04823..2da5fde106 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/ClientProxyTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/ClientProxyTest.java @@ -6,17 +6,23 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.jboss.cdi.tck.tests.lookup.clientProxy.integration; +import static org.jboss.cdi.tck.TestGroups.INTEGRATION; +import static org.jboss.cdi.tck.cdi.Sections.CLIENT_PROXIES; +import static org.jboss.cdi.tck.cdi.Sections.CLIENT_PROXY_INVOCATION; +import static org.jboss.cdi.tck.cdi.Sections.CONTEXTUAL_REFERENCE_VALIDITY; + import java.io.IOException; import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.context.spi.Context; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -26,11 +32,6 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import static org.jboss.cdi.tck.TestGroups.INTEGRATION; -import static org.jboss.cdi.tck.cdi.Sections.CLIENT_PROXIES; -import static org.jboss.cdi.tck.cdi.Sections.CLIENT_PROXY_INVOCATION; -import static org.jboss.cdi.tck.cdi.Sections.CONTEXTUAL_REFERENCE_VALIDITY; - @SpecVersion(spec = "cdi", version = "2.0") public class ClientProxyTest extends AbstractTest { @@ -66,7 +67,8 @@ public void testClientProxyInvocation() { } @Test(groups = INTEGRATION, expectedExceptions = { ContextNotActiveException.class, IllegalStateException.class }) - @SpecAssertions({ @SpecAssertion(section = CLIENT_PROXY_INVOCATION, id = "ab"), @SpecAssertion(section = CONTEXTUAL_REFERENCE_VALIDITY, id = "a") }) + @SpecAssertions({ @SpecAssertion(section = CLIENT_PROXY_INVOCATION, id = "ab"), + @SpecAssertion(section = CONTEXTUAL_REFERENCE_VALIDITY, id = "a") }) public void testInactiveScope() throws Exception { assert getCurrentConfiguration().getContexts().getRequestContext().isActive(); Context ctx = getCurrentConfiguration().getContexts().getRequestContext(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Fox.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Fox.java index a079742760..c7d572e881 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Fox.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Fox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Tuna.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Tuna.java index 71bbf5c22f..2492463a84 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Tuna.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/Tuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/TunedTuna.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/TunedTuna.java index fb2f7246f9..2803edea0e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/TunedTuna.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/clientProxy/integration/TunedTuna.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/ear/MultiModuleSessionBeanAmbiguousDependencyTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/ear/MultiModuleSessionBeanAmbiguousDependencyTest.java index 26f248a750..539a66146e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/ear/MultiModuleSessionBeanAmbiguousDependencyTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/dependency/resolution/broken/ambiguous/ear/MultiModuleSessionBeanAmbiguousDependencyTest.java @@ -32,7 +32,7 @@ /** * Test that ambiguous dependency is detected when multiple beans eligible for injection to the injection point are deployed in * different modules. See WELD-1586 for more info. - * + * * @author Matus Abaffy */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java index 6b0e73275e..03de97cd0c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/IntegrationWithUnifiedELTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/Sheep.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/Sheep.java index e5830d2c04..7cad0dba6d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/Sheep.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/el/integration/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/MegaPoorHenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/MegaPoorHenHouse.java index 70b2fba7d3..131c7d58cb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/MegaPoorHenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/MegaPoorHenHouse.java @@ -1,21 +1,21 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.injection; - -import jakarta.enterprise.context.Dependent; - -@Dependent -public class MegaPoorHenHouse extends PoorHenHouse { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.injection; + +import jakarta.enterprise.context.Dependent; + +@Dependent +public class MegaPoorHenHouse extends PoorHenHouse { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/PoorHenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/PoorHenHouse.java index 0998594487..70fb910121 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/PoorHenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/PoorHenHouse.java @@ -1,22 +1,23 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.injection; - -import jakarta.enterprise.context.Dependent; -import org.jboss.cdi.tck.tests.lookup.injection.ejb.HenHouse; - -@Dependent -public class PoorHenHouse extends HenHouse { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.injection; + +import jakarta.enterprise.context.Dependent; + +import org.jboss.cdi.tck.tests.lookup.injection.ejb.HenHouse; + +@Dependent +public class PoorHenHouse extends HenHouse { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/DeluxeHenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/DeluxeHenHouse.java index c0c4aeb30d..8383c4e14a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/DeluxeHenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/DeluxeHenHouse.java @@ -18,6 +18,7 @@ import jakarta.ejb.EJB; import jakarta.enterprise.context.Dependent; import jakarta.inject.Inject; + import org.jboss.cdi.tck.tests.lookup.injection.Wolf; @Dependent @@ -39,7 +40,8 @@ public class DeluxeHenHouse extends HenHouse { @Inject public void initialize() { - initializerCalledAfterInjectionPointsInit = (fox != null && wolf != null && "Hello".equals(greeting) && "Hello".equals(superGreeting) + initializerCalledAfterInjectionPointsInit = (fox != null && wolf != null && "Hello".equals(greeting) + && "Hello".equals(superGreeting) && game.equals("poker") && superGame.equals("poker") && sessionBean.ping() && superSessionBean.ping()); } @@ -47,7 +49,7 @@ public void initialize() { public void postConstruct() { postConstructCalledAfterInitializers = (initializerCalledAfterInjectionPointsInit && hen != null); } - + @Resource(name = "game") private void setGame(String game) { this.game = game; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/HenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/HenHouse.java index 9acea1e752..20f4c0fab9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/HenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/ejb/HenHouse.java @@ -17,6 +17,7 @@ import jakarta.ejb.EJB; import jakarta.enterprise.context.Dependent; import jakarta.inject.Inject; + import org.jboss.cdi.tck.tests.lookup.injection.Fox; import org.jboss.cdi.tck.tests.lookup.injection.Hen; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java index e72c8011e9..213c67b937 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java index fb26623f94..2a9767183f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/DeluxeHenHouseLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Farm.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Farm.java index bd6b48a1dc..8482c5e6b3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Farm.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmInterceptor.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmInterceptor.java index 9b50dc907b..d7e44b4b88 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmInterceptor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmInterceptor.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmLocal.java index 550569a635..8f8226f9a2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/FarmLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Fox.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Fox.java index 4add15c3c8..19f75f099d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Fox.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Fox.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/HenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/HenHouse.java index 5af68c63fa..43ebe1c034 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/HenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/HenHouse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBean.java index f79c7d8fa0..273de5e60c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBeanLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBeanLocal.java index ed447b1f33..99d12878a5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBeanLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/InjectedSessionBeanLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java index a376fdd3e5..e1e00b8a33 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java index 86de795018..285352d72f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/MegaPoorHenHouseLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/PoorHenHouse.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/PoorHenHouse.java index 5308f8ce9e..409ad7ed1b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/PoorHenHouse.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/PoorHenHouse.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java index f8ec1c887b..5ee84e4120 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionOrderingTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -48,7 +48,8 @@ public void testPostConstructCalledAfterInitializerOfSuperclass() { } @Test - @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bc"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bd") }) + @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bc"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bd") }) public void testInitializerCalledAfterResourceInjection() { assert getContextualReference(InjectedSessionBeanLocal.class).isInitializerCalledAfterResourceInjection(); } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java index d7cbc7c95c..6cdc3348b5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -37,22 +37,26 @@ public static WebArchive createTestArchive() { } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "a"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "aa"), - @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ab"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ba"), + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "a"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "aa"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ab"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ba"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "be") }) public void testInjectionOnContextualSessionBean() { assert getContextualReference(FarmLocal.class).isInjectionPerformedCorrectly(); } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "c"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ak"), + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "c"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ak"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "al") }) public void testInjectionOnNonContextualSessionBean() { assert getContextualReference(InjectedSessionBeanLocal.class).getFarm().isInjectionPerformedCorrectly(); } @Test - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ed"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ao"), + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ed"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ao"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ap") }) public void testInjectionOnEJBInterceptor() { // Test interceptor that intercepts contextual Session Bean diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Sheep.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Sheep.java index c0f1255a99..e0cb402a3f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Sheep.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SuperInjectedSessionBean.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SuperInjectedSessionBean.java index 3ecd05c386..8248454e33 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SuperInjectedSessionBean.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/SuperInjectedSessionBean.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/chain/SessionBeanInjectionChainTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/chain/SessionBeanInjectionChainTest.java index 03a72fc9fe..ea899db342 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/chain/SessionBeanInjectionChainTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/enterprise/chain/SessionBeanInjectionChainTest.java @@ -30,7 +30,7 @@ import org.testng.annotations.Test; /** - * + * * @author Martin Kouba * @see CDITCK-15 */ diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/CreationalContextForNonContextualTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/CreationalContextForNonContextualTest.java index 36f0a9379f..a2b0295e7d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/CreationalContextForNonContextualTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/CreationalContextForNonContextualTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Farm.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Farm.java index bb16d04725..010a37358b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Farm.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Farm.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java index a111d7f71c..fb973c23ba 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java @@ -23,8 +23,6 @@ import java.net.URL; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.WebResponse; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.cdi.tck.AbstractTest; @@ -35,6 +33,9 @@ import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.WebResponse; + @SpecVersion(spec = "cdi", version = "2.0") public class InjectionIntoNonContextualComponentTest extends AbstractTest { @@ -44,7 +45,8 @@ public class InjectionIntoNonContextualComponentTest extends AbstractTest { @Deployment(testable = false) public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(InjectionIntoNonContextualComponentTest.class) - .withClasses(Farm.class, ProcessAnnotatedTypeObserver.class, SessionBean.class, Sheep.class, TagLibraryListener.class, + .withClasses(Farm.class, ProcessAnnotatedTypeObserver.class, SessionBean.class, Sheep.class, + TagLibraryListener.class, TestFilter.class, TestListener.class, TestServlet.class, TestTagHandler.class) .withWebXml("web2.xml") .withWebResource("ManagedBeanTestPage.xhtml", "ManagedBeanTestPage.xhtml") @@ -54,15 +56,18 @@ public static WebArchive createTestArchive() { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ef"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ae"), - @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bn"), @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ef"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ae"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bn"), + @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) public void testInjectionIntoServlet() throws Exception { WebClient webClient = new WebClient(); webClient.getPage(contextPath + "Test/Servlet?test=injection"); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "af"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bm"), + @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "af"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bm"), @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "b") }) public void testServletInitializerMethodCalled() throws Exception { WebClient webClient = new WebClient(); @@ -85,15 +90,18 @@ public void testServletInitCalledAfterPersistenceResourceInjection() throws Exce } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "eg"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ag"), - @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bq"), @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "eg"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ag"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bq"), + @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) public void testInjectionIntoFilter() throws Exception { WebClient webClient = new WebClient(); webClient.getPage(contextPath + "TestFilter?test=injection"); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ah"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bp"), + @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ah"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "bp"), @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "b") }) public void testFilterInitializerMethodCalled() throws Exception { WebClient webClient = new WebClient(); @@ -116,7 +124,8 @@ public void testFilterInitCalledAfterPersistenceResourceInjection() throws Excep } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ea"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ai"), + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ea"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "ai"), @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) public void testInjectionIntoServletListener() throws Exception { WebClient webClient = new WebClient(); @@ -124,15 +133,18 @@ public void testInjectionIntoServletListener() throws Exception { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "aj"), @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "aj"), + @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "b") }) public void testServletListenerInitializerMethodCalled() throws Exception { WebClient webClient = new WebClient(); webClient.getPage(contextPath + "Test/ServletListener?test=initializer"); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "eb"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "am"), - @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "an"), @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "eb"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "am"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "an"), + @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) public void testInjectionIntoTagHandler() throws Exception { WebClient webClient = new WebClient(); WebResponse response = webClient.getPage(contextPath + "TagPage.jsp").getWebResponse(); @@ -142,7 +154,8 @@ public void testInjectionIntoTagHandler() throws Exception { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ec"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "as"), + @SpecAssertions({ @SpecAssertion(section = INJECTION_EE, id = "ec"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "as"), @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) public void testInjectionIntoTagLibraryListener() throws Exception { WebClient webClient = new WebClient(); @@ -150,15 +163,18 @@ public void testInjectionIntoTagLibraryListener() throws Exception { } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "at"), @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "at"), + @SpecAssertion(section = INITIALIZER_METHODS_EE, id = "b") }) public void testTagLibraryListenerInitializerMethodCalled() throws Exception { WebClient webClient = new WebClient(); webClient.getPage(contextPath + "Test/TagLibraryListener?test=initializer"); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = INJECTION, id = "d"), @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "au"), - @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "av"), @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) + @SpecAssertions({ @SpecAssertion(section = INJECTION, id = "d"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "au"), + @SpecAssertion(section = FIELDS_INITIALIZER_METHODS_EE, id = "av"), + @SpecAssertion(section = INJECTED_FIELDS_EE, id = "b") }) public void testInjectionIntoJSFManagedBean() throws Exception { WebClient webclient = new WebClient(); String content = webclient.getPage(contextPath + "ManagedBeanTestPage.jsf").getWebResponse().getContentAsString(); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Sheep.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Sheep.java index f7c08dbb93..5b5a3c1300 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Sheep.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/Sheep.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java index d6a0a120d5..363bfccb0b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestListener.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestListener.java index 099b993c2e..a4aa916af9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestListener.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestListener.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestTagHandler.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestTagHandler.java index 34c2f1eb70..2c02ef176c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestTagHandler.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/TestTagHandler.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/AmbiguousInjectionIntoNonContextualComponentTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/AmbiguousInjectionIntoNonContextualComponentTest.java index c158369058..9cdd64f13e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/AmbiguousInjectionIntoNonContextualComponentTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/AmbiguousInjectionIntoNonContextualComponentTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/TestServlet.java index 8c2f248d89..f3a3f4fc7b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/ambiguous/TestServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/TestServlet.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/TestServlet.java index d26838edb4..be08fc2682 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/TestServlet.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/TestServlet.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/UnsatisfiedInjectionIntoNonContextualComponentTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/UnsatisfiedInjectionIntoNonContextualComponentTest.java index b29f08daa8..b2e005cde4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/UnsatisfiedInjectionIntoNonContextualComponentTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/broken/unsatisfied/UnsatisfiedInjectionIntoNonContextualComponentTest.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/persistence/SpecialPersistor.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/persistence/SpecialPersistor.java index 6ce74729c5..d3a6c773d5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/persistence/SpecialPersistor.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injection/persistence/SpecialPersistor.java @@ -25,7 +25,7 @@ public class SpecialPersistor extends Persistor { @PersistenceContext EntityManager persistenceContextField; - + EntityManager persistenceContext; @PersistenceUnit diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/not/bean/TestServlet_Broken.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/not/bean/TestServlet_Broken.java index 161c675012..da22ea45f0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/not/bean/TestServlet_Broken.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/broken/not/bean/TestServlet_Broken.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/Foo.java index d3aa6fc754..c0e60c1f3f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/Foo.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class Foo { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/NonContextualInjectionPointTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/NonContextualInjectionPointTest.java index 9717fb9d3a..c200298784 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/NonContextualInjectionPointTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/injectionpoint/non/contextual/NonContextualInjectionPointTest.java @@ -20,10 +20,11 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; +import javax.naming.InitialContext; + import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.spi.Bean; import jakarta.inject.Inject; -import javax.naming.InitialContext; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/jndi/JndiBeanManagerInjected.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/jndi/JndiBeanManagerInjected.java index 3751b821c8..170c56847d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/jndi/JndiBeanManagerInjected.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/jndi/JndiBeanManagerInjected.java @@ -13,9 +13,10 @@ */ package org.jboss.cdi.tck.tests.lookup.manager.jndi; +import javax.naming.NamingException; + import jakarta.ejb.Stateful; import jakarta.enterprise.inject.spi.BeanManager; -import javax.naming.NamingException; import org.jboss.cdi.tck.util.JndiLookupUtils; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Alpha.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Alpha.java index 9e270326ca..9bfa1a93a6 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Alpha.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Alpha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bar.java index a603515276..441e64df14 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Baz.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Baz.java index 7412733fcc..449446fc85 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Baz.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Baz.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bravo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bravo.java index aa0278b2ce..2a37baa46e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bravo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Bravo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java index 3181392654..595390783d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/CDIProviderInitTest.java @@ -21,6 +21,7 @@ import jakarta.enterprise.inject.spi.CDI; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Charlie.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Charlie.java index d6353633ce..75d7314c93 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Charlie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Charlie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Foo.java index 563f22fd4d..e83b1f11fb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Marker.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Marker.java index 9a2db52dc9..36ab24b80c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Marker.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/Marker.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda1.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda1.java index cd5b34936f..afaf523f40 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda1.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda1.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda2.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda2.java index 587ffcdb22..93327c0226 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda2.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerBda2.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerNonBda.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerNonBda.java index 2d3d596e68..f1fbaa3636 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerNonBda.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerNonBda.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerWar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerWar.java index b7ad95c8f8..63922560c7 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerWar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/init/MarkerObtainerWar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Alpha.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Alpha.java index a43f31be8c..93a03fd6bc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Alpha.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Alpha.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @Powerful @Dependent diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/AlphaLocator.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/AlphaLocator.java index f963ae5a07..2c3d809201 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/AlphaLocator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/AlphaLocator.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ public final class AlphaLocator { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Bravo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Bravo.java index 540a1dad57..631ae47cd5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Bravo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Bravo.java @@ -20,7 +20,7 @@ /** * @author Martin Kouba - * + * */ @Alternative @Dependent diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoLocator.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoLocator.java index dc45e7e579..1a54964874 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoLocator.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoLocator.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ public final class BravoLocator { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoMarker.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoMarker.java index aaa8fe0b55..d36b3639ce 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoMarker.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/BravoMarker.java @@ -19,7 +19,7 @@ /** * @author Martin Kouba - * + * */ @Dependent public class BravoMarker { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java index efba082878..1856728182 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/CDIProviderRuntimeTest.java @@ -23,6 +23,7 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.CDI; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.WebArchiveBuilder; @@ -51,7 +52,8 @@ public static WebArchive createTestArchive() { // BDA01 .withBeanLibrary( new BeansXml().alternatives(Bravo.class), - Bravo.class, BravoLocator.class, BravoMarker.class).build(); + Bravo.class, BravoLocator.class, BravoMarker.class) + .build(); } @Test(dataProvider = ARQUILLIAN_DATA_PROVIDER) diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Powerful.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Powerful.java index 9fc7866731..d0593d2317 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Powerful.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/Powerful.java @@ -1,33 +1,33 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.manager.provider.runtime; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Powerful { -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.manager.provider.runtime; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Powerful { +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/PowerfulLiteral.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/PowerfulLiteral.java index 07ba5fbd5d..3e95aed766 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/PowerfulLiteral.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/manager/provider/runtime/PowerfulLiteral.java @@ -18,7 +18,7 @@ /** * @author Martin Kouba - * + * */ @SuppressWarnings("all") public class PowerfulLiteral extends AnnotationLiteral implements Powerful { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Bar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Bar.java index 83bed38279..0601726ad9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Bar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Bar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashEjbFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashEjbFoo.java index d616f315e3..ed8f7ac601 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashEjbFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashEjbFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashFoo.java index 1cda6dfd7e..11ca67aa06 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/CashFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFoo.java index 33e8a635dc..632d4ad5a4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFooLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFooLocal.java index f9f096d0a3..570be2277c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFooLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EjbFooLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailability02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailability02Test.java index 65dcb13c5d..2c546f81c3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailability02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailability02Test.java @@ -29,12 +29,10 @@ import org.testng.Assert; import org.testng.annotations.Test; - - /** * Test that bean in web module bean archive can inject enabled managed bean from another bean archive. - * - * + * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -42,7 +40,8 @@ public class EnabledManagedBeanInjectionAvailability02Test extends AbstractTest @Deployment public static WebArchive createTestArchive() { - WebArchive webArchive = new WebArchiveBuilder().withTestClass(EnabledManagedBeanInjectionAvailability02Test.class).withClasses(ManagedFoo.class) + WebArchive webArchive = new WebArchiveBuilder().withTestClass(EnabledManagedBeanInjectionAvailability02Test.class) + .withClasses(ManagedFoo.class) .withBeanLibrary(Foo.class, Bar.class).withBeanLibrary(WebBar.class) .build(); @@ -53,7 +52,8 @@ public static WebArchive createTestArchive() { Bar bar; @Test - @SpecAssertions({ @SpecAssertion(section = INTER_MODULE_INJECTION, id = "c"), @SpecAssertion(section = SELECTION, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = INTER_MODULE_INJECTION, id = "c"), + @SpecAssertion(section = SELECTION, id = "aa") }) public void testInjection() throws Exception { Assert.assertEquals(bar.ping(), 0); assert bar.getFoo() instanceof ManagedFoo; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailabilityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailabilityTest.java index 6e7c8e8574..7aca8b50e4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailabilityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledManagedBeanInjectionAvailabilityTest.java @@ -33,10 +33,10 @@ /** * Test that bean in web module can inject enabled managed bean from EJB module. - * + * * Note that we DO NOT include test class in EJB module since we wouldn't be able to inject bean from web module (Java EE * classloading requirements)! - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") @@ -59,7 +59,8 @@ public static EnterpriseArchive createTestArchive() { Bar bar; @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = INTER_MODULE_INJECTION, id = "c"), @SpecAssertion(section = SELECTION, id = "aa") }) + @SpecAssertions({ @SpecAssertion(section = INTER_MODULE_INJECTION, id = "c"), + @SpecAssertion(section = SELECTION, id = "aa") }) public void testInjection() throws Exception { Assert.assertEquals(bar.ping(), 0); assert bar.getFoo() instanceof ManagedFoo; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerFieldInjectionAvailability02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerFieldInjectionAvailability02Test.java index 83967f8f2e..37620d1388 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerFieldInjectionAvailability02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerFieldInjectionAvailability02Test.java @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Matej Briskar */ @SpecVersion(spec = "cdi", version = "2.0") @@ -38,7 +38,8 @@ public class EnabledProducerFieldInjectionAvailability02Test extends AbstractTes @Deployment public static WebArchive createTestArchive() { WebArchive webArchive = new WebArchiveBuilder().withTestClass(EnabledProducerFieldInjectionAvailability02Test.class) - .withClasses(FooFieldProducer.class, ProducedFoo.class).withBeanLibrary(Foo.class, Bar.class).withBeanLibrary(WebBar.class).build(); + .withClasses(FooFieldProducer.class, ProducedFoo.class).withBeanLibrary(Foo.class, Bar.class) + .withBeanLibrary(WebBar.class).build(); return webArchive; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerMethodInjectionAvailability02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerMethodInjectionAvailability02Test.java index a8900ef678..a691defa69 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerMethodInjectionAvailability02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledProducerMethodInjectionAvailability02Test.java @@ -29,7 +29,7 @@ import org.testng.annotations.Test; /** - * + * * @author Matej Briskar */ @@ -39,7 +39,8 @@ public class EnabledProducerMethodInjectionAvailability02Test extends AbstractTe @Deployment public static WebArchive createTestArchive() { WebArchive webArchive = new WebArchiveBuilder().withTestClass(EnabledProducerMethodInjectionAvailability02Test.class) - .withClasses(FooMethodProducer.class, ProducedFoo.class).withBeanLibrary(Foo.class, Bar.class).withBeanLibrary(WebBar.class).build(); + .withClasses(FooMethodProducer.class, ProducedFoo.class).withBeanLibrary(Foo.class, Bar.class) + .withBeanLibrary(WebBar.class).build(); return webArchive; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailability02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailability02Test.java index 58ac5398a4..c6ef604c5c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailability02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailability02Test.java @@ -36,7 +36,8 @@ public class EnabledSessionBeanInjectionAvailability02Test extends AbstractTest @Deployment public static WebArchive createTestArchive() { WebArchive webArchive = new WebArchiveBuilder().withTestClass(EnabledSessionBeanInjectionAvailability02Test.class) - .withClasses(EjbFoo.class, EjbFooLocal.class).withBeanLibrary(Foo.class, Bar.class).withBeanLibrary(WebBar.class) + .withClasses(EjbFoo.class, EjbFooLocal.class).withBeanLibrary(Foo.class, Bar.class) + .withBeanLibrary(WebBar.class) .build(); return webArchive; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailabilityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailabilityTest.java index e82465c5a2..008277651d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailabilityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/EnabledSessionBeanInjectionAvailabilityTest.java @@ -33,10 +33,10 @@ /** * Test that bean in web module can inject enabled session bean from EJB module. - * + * * Note that we DO NOT include test class in EJB module since we wouldn't be able to inject bean from web module (Java EE * classloading requirements)! - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Enterprise.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Enterprise.java index 7abd849944..e7f5dd409a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Enterprise.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Enterprise.java @@ -1,34 +1,34 @@ -/* - * Copyright 2010, Red Hat, Inc., and individual contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.cdi.tck.tests.lookup.modules; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import jakarta.inject.Qualifier; - -@Target({ TYPE, METHOD, PARAMETER, FIELD }) -@Retention(RUNTIME) -@Documented -@Qualifier -public @interface Enterprise { - -} +/* + * Copyright 2010, Red Hat, Inc., and individual contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.cdi.tck.tests.lookup.modules; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import jakarta.inject.Qualifier; + +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@Qualifier +public @interface Enterprise { + +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Foo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Foo.java index 4708f60a67..96018b45e4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Foo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Foo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooFieldProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooFieldProducer.java index 02fafe5dc8..d9cfa34fcd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooFieldProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooFieldProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooMethodProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooMethodProducer.java index d422c60c81..0450788f02 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooMethodProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/FooMethodProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleELResolutionTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleELResolutionTest.java index 887e6c63b6..f98e2c1944 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleELResolutionTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleELResolutionTest.java @@ -30,10 +30,10 @@ /** * Test that bean in web module can resolve enabled bean via EL from EJB module. - * + * * Note that we DO NOT include test class in EJB module since we wouldn't be able to inject bean from web module (Java EE * classloading requirements)! - * + * * @author Martin Kouba */ @Test diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleLookupTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleLookupTest.java index 855580d183..d89c4a4fc9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleLookupTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/InterModuleLookupTest.java @@ -30,10 +30,10 @@ /** * Test that bean in web module can lookup enabled bean from EJB module. - * + * * Note that we DO NOT include test class in EJB module since we wouldn't be able to inject bean from web module (Java EE * classloading requirements)! - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ManagedFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ManagedFoo.java index ff46a191b5..23453b10db 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ManagedFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ManagedFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentEjbFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentEjbFoo.java index 89caf2aaa8..4586700a6c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentEjbFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentEjbFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentFoo.java index 9367bf62e9..af4fef17af 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/PaymentFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ProducedFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ProducedFoo.java index b0060ca2da..41e0d869bb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ProducedFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/ProducedFoo.java @@ -18,7 +18,7 @@ public class ProducedFoo implements Foo { private int value; public ProducedFoo(Integer value) { - if(value == null) { + if (value == null) { this.value = 0; } else { this.value = value; diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java index 7ac40b2e51..eb76e7a3b5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailability02Test.java @@ -17,6 +17,7 @@ import static org.jboss.cdi.tck.cdi.Sections.INTER_MODULE_INJECTION; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -32,7 +33,8 @@ public class SelectedAlternativeManagedBeanInjectionAvailability02Test extends A @Deployment public static WebArchive createTestArchive() { - WebArchive webArchive = new WebArchiveBuilder().withTestClass(SelectedAlternativeManagedBeanInjectionAvailability02Test.class) + WebArchive webArchive = new WebArchiveBuilder() + .withTestClass(SelectedAlternativeManagedBeanInjectionAvailability02Test.class) .withClasses(AlternativeFoo.class).withBeanLibrary(Foo.class, Bar.class) .withBeanLibrary(new BeansXml().alternatives(AlternativeFoo.class), WebBar.class) .build(); @@ -49,4 +51,4 @@ public void testInjection() throws Exception { Assert.assertEquals(bar.ping(), 42); } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java index fbcd3c4927..a1ac99ddb8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeManagedBeanInjectionAvailabilityTest.java @@ -18,6 +18,7 @@ import static org.jboss.cdi.tck.cdi.Sections.INTER_MODULE_INJECTION; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; @@ -31,12 +32,12 @@ /** * Test that bean in web module can inject selected alternative managed bean from EJB module. - * + * * classloading requirements)! - * + * * Also note that we need to enable alternative in web module to have it working according to spec (section 5.1.4 Inter-module * injection). - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java index 7e659b695d..055c3ba11a 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailability02Test.java @@ -18,6 +18,7 @@ import static org.jboss.cdi.tck.cdi.Sections.SELECTION_EE; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -34,7 +35,8 @@ public class SelectedAlternativeSessionBeanInjectionAvailability02Test extends A @Deployment public static WebArchive createTestArchive() { - WebArchive webArchive = new WebArchiveBuilder().withTestClass(SelectedAlternativeSessionBeanInjectionAvailability02Test.class) + WebArchive webArchive = new WebArchiveBuilder() + .withTestClass(SelectedAlternativeSessionBeanInjectionAvailability02Test.class) .withClasses(AlternativeEjbFoo.class, EjbFooLocal.class).withBeanLibrary(Foo.class, Bar.class) .withBeanLibrary(new BeansXml().alternatives(AlternativeEjbFoo.class), WebBar.class) .build(); @@ -51,4 +53,4 @@ public void testInjection() throws Exception { Assert.assertEquals(bar.ping(), 42); } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java index eb772c669c..4c9a087b2e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SelectedAlternativeSessionBeanInjectionAvailabilityTest.java @@ -24,8 +24,6 @@ import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.descriptor.api.Descriptors; -import org.jboss.shrinkwrap.descriptor.api.beans11.BeansDescriptor; import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; @@ -34,13 +32,13 @@ /** * Test that bean in web module can inject selected alternative managed bean from EJB module. - * + * * Note that we DO NOT include test class in EJB module since we wouldn't be able to inject bean from web module (Java EE * classloading requirements)! - * + * * Also note that we need to enable alternative in web module to have it working according to spec (section 5.1.4 Inter-module * injection). - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SpecializedProducerMethodInjectionNotAvailable02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SpecializedProducerMethodInjectionNotAvailable02Test.java index 5196be8dcd..48543cc740 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SpecializedProducerMethodInjectionNotAvailable02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/SpecializedProducerMethodInjectionNotAvailable02Test.java @@ -35,8 +35,10 @@ public class SpecializedProducerMethodInjectionNotAvailable02Test extends Abstra @Deployment public static WebArchive createTestArchive() { - WebArchive webArchive = new WebArchiveBuilder().withTestClass(SpecializedProducerMethodInjectionNotAvailable02Test.class) - .withClasses(SpecializingFooMethodProducer.class, FooMethodProducer.class, ProducedFoo.class).withBeanLibrary(Foo.class, Bar.class) + WebArchive webArchive = new WebArchiveBuilder() + .withTestClass(SpecializedProducerMethodInjectionNotAvailable02Test.class) + .withClasses(SpecializingFooMethodProducer.class, FooMethodProducer.class, ProducedFoo.class) + .withBeanLibrary(Foo.class, Bar.class) .withBeanLibrary(WebBar.class).build(); return webArchive; } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Standard.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Standard.java index a690322acd..bb544452cd 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Standard.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/Standard.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebBar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebBar.java index 0f40eb5f9a..3ea51d474d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebBar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebBar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooELResolver.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooELResolver.java index f53189b432..dad62e29d0 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooELResolver.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooELResolver.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +22,7 @@ /** * This bean uses {@link EL} implementation located in EAR library. - * + * * @author Martin Kouba */ @Dependent diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooLookup.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooLookup.java index 796321cf87..0f058a4367 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooLookup.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebFooLookup.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentBar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentBar.java index 0eb34b7615..c7cedc5a2d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentBar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentBar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentEjbBar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentEjbBar.java index 0d4520a27a..0481892673 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentEjbBar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/WebPaymentEjbBar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenBar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenBar.java index fc7f82e044..8d41fa24a9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenBar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenBar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenFoo.java index 7d9d28da9a..948ea1121b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenProducedFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenProducedFoo.java index 5b815009c7..0cacd5ca7b 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenProducedFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenProducedFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenWebBar.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenWebBar.java index 15b26a9ab7..64d967b2a3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenWebBar.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/BrokenWebBar.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledEjbFoo.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledEjbFoo.java index a118f04307..acd4944553 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledEjbFoo.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledEjbFoo.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooFieldProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooFieldProducer.java index fd0b094aaa..2afab72242 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooFieldProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooFieldProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooMethodProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooMethodProducer.java index ec39da8cc0..dd41e6c288 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooMethodProducer.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledFooMethodProducer.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerFieldInjectionNotAvailableTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerFieldInjectionNotAvailableTest.java index 2bd824daa5..8508ba29d3 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerFieldInjectionNotAvailableTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerFieldInjectionNotAvailableTest.java @@ -31,7 +31,7 @@ /** * Test that bean in web module cannot inject disabled producer field from EJB module. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerMethodInjectionNotAvailableTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerMethodInjectionNotAvailableTest.java index 8bd88dc9d7..828cdad021 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerMethodInjectionNotAvailableTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledProducerMethodInjectionNotAvailableTest.java @@ -31,7 +31,7 @@ /** * Test that bean in web module cannot inject disabled producer method from EJB module. - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledSessionBeanInjectionNotAvailableTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledSessionBeanInjectionNotAvailableTest.java index fb26a23658..ff770046c9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledSessionBeanInjectionNotAvailableTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/DisabledSessionBeanInjectionNotAvailableTest.java @@ -25,15 +25,13 @@ import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; -import org.jboss.shrinkwrap.api.BeanDiscoveryMode; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.impl.BeansXml; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; /** - * + * * @author Martin Kouba */ @SpecVersion(spec = "cdi", version = "2.0") diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/EjbFooLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/EjbFooLocal.java index d423f1d7ef..575bd37df2 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/EjbFooLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/broken/EjbFooLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/BarBinding.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/BarBinding.java index 154b5ab3db..842e8f8c40 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/BarBinding.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/BarBinding.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/Dog.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/Dog.java index 50c78e8d14..79bb1a4e1c 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/Dog.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/Dog.java @@ -13,10 +13,10 @@ */ package org.jboss.cdi.tck.tests.lookup.modules.interceptors; -import jakarta.enterprise.context.Dependent; - import java.io.Serializable; +import jakarta.enterprise.context.Dependent; + @SuppressWarnings("serial") @Dependent public class Dog implements Animal, Serializable { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java index e48830f2a5..b5c0f358e4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/interceptors/InterceptorModularityTest.java @@ -20,6 +20,7 @@ import static org.testng.Assert.assertTrue; import jakarta.enterprise.inject.Instance; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.Testable; import org.jboss.cdi.tck.AbstractTest; @@ -63,8 +64,8 @@ public static EnterpriseArchive createTestArchive() { JavaArchive fooArchive = ShrinkWrap.create(JavaArchive.class, TEST1_JAR) .addClasses(BarInterceptor.class, Dog.class, DummySessionBean.class) .setManifest(new StringAsset(Descriptors.create(ManifestDescriptor.class) - .addToClassPath(EnterpriseArchiveBuilder.DEFAULT_EJB_MODULE_NAME) - .exportAsString())) + .addToClassPath(EnterpriseArchiveBuilder.DEFAULT_EJB_MODULE_NAME) + .exportAsString())) .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); enterpriseArchive.addAsModule(fooArchive); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity01Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity01Test.java index 20f00b4b58..ba1a796dc5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity01Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity01Test.java @@ -32,17 +32,17 @@ /** * Simple WAR with multiple libraries. - * + * * Library 1 defines bean {@link Handler}. Library 2 defines bean {@link UppercaseHandler} which specializes {@link Handler}. * Bean {@link Alpha} packaged in WEB-INF/classes has an injection point of type {@link Handler}. Bean {@link Bravo} packaged in * library 1 has an injection point of type {@link Handler}. Bean {@link Charlie} packaged in library 1 has an injection point * of type {@link Handler}. - * - * + * + * * Expected result: {@link UppercaseHandler} is injected into beans {@link Alpha}, {@link Bravo} and {@link Charlie} - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SpecializationModularity01Test extends AbstractTest { @@ -64,7 +64,8 @@ public static WebArchive createTestArchive() { Charlie charlie; @Test - @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia") }) + @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), + @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia") }) public void testSpecialization() { assertNotNull(alpha); assertEquals(alpha.hello(), "HELLO"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity02Test.java index bb0a0122f1..118f2424e4 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity02Test.java @@ -38,14 +38,14 @@ *

  • 1 WAR
    • *
  • 1 shared library
    • * - * + * * Shared library defines {@link Handler}. WEB-INF/classes defines {@link UppercaseHandler} which specializes {@link Handler}. * Bean {@link Alpha} packaged in WEB-INF/classes has an injection point of type {@link Handler}. - * + * * Expected result: {@link UppercaseHandler} is injected into {@link Alpha} - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SpecializationModularity02Test extends AbstractTest { @@ -67,7 +67,8 @@ public static EnterpriseArchive createTestArchive() { Alpha alpha; @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia") }) + @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), + @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia") }) public void testSpecialization() { assertNotNull(alpha); assertEquals(alpha.hello(), "HELLO"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity03Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity03Test.java index 20213b5066..c89db0ce73 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity03Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity03Test.java @@ -37,16 +37,16 @@ *
  • 1 WAR
    • *
  • 1 shared library
    • * - * + * * Shared library defines {@link Handler}. WEB-INF/classes defines {@link UppercaseHandler} which specializes {@link Handler}. * Bean {@link Alpha} packaged in WEB-INF/classes has an injection point of type {@link Handler}. Bean {@link Bravo} packaged in * the shared library has an injection point of type {@link Handler}. - * + * * Expected result: UnsatisfiedDependencyException - {@link Bravo} cannot see {@link UppercaseHandler}, {@link Handler} is not * enabled - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SpecializationModularity03Test extends AbstractTest { @@ -66,7 +66,8 @@ public static EnterpriseArchive createTestArchive() { } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), @SpecAssertion(section = INTER_MODULE_INJECTION, id = "l") }) + @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), + @SpecAssertion(section = INTER_MODULE_INJECTION, id = "l") }) public void testSpecialization() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity04Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity04Test.java index 71a053c5a7..d0ef509141 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity04Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity04Test.java @@ -38,15 +38,15 @@ *
  • 1 WAR
    • *
  • 2 shared libraries (can see each other)
    • * - * + * * Shared library 1 defines {@link Handler}. Shared library 2 defines {@link UppercaseHandler} which specializes {@link Handler} * . Bean {@link Alpha} packaged in WEB-INF/classes has an injection point of type {@link Handler}. Bean {@link Bravo} packaged * in the shared library 1 has an injection point of type {@link Handler}. - * + * * Expected result: {@link UppercaseHandler} injected into {@link Alpha} and {@link Bravo} - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SpecializationModularity04Test extends AbstractTest { @@ -71,7 +71,8 @@ public static EnterpriseArchive createTestArchive() { Bravo bravo; @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia") }) + @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), + @SpecAssertion(section = DIRECT_AND_INDIRECT_SPECIALIZATION, id = "ia") }) public void testSpecialization() { assertNotNull(alpha); assertEquals(alpha.hello(), "HELLO"); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity05Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity05Test.java index dc55c62a26..777c2758b5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity05Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity05Test.java @@ -37,17 +37,17 @@ *
  • 1 WAR
    • *
  • 2 shared libraries (can see each other)
    • * - * + * * Shared library 1 defines {@link Handler}. WEB-INF/classes defines {@link UppercaseHandler} which specializes {@link Handler}. * Bean {@link Alpha} packaged in WEB-INF/classes has an injection point of type {@link Handler}. Bean {@link Bravo} packaged in * the shared library 1 has an injection point of type {@link Handler}. Bean {@link Charlie} packaged in the shared library 2 * has an injection point of type {@link Handler}. - * + * * Expected result: UnsatisfiedDependencyException - {@link Bravo} and {@link Charlie} cannot see {@link UppercaseHandler}, * {@link Handler} is not enabled - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SpecializationModularity05Test extends AbstractTest { @@ -67,7 +67,8 @@ public static EnterpriseArchive createTestArchive() { } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), @SpecAssertion(section = INTER_MODULE_INJECTION, id = "l") }) + @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), + @SpecAssertion(section = INTER_MODULE_INJECTION, id = "l") }) public void testSpecialization() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity06Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity06Test.java index 9a1d526acf..6087edcf6d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity06Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity06Test.java @@ -37,17 +37,17 @@ *
  • 2 WARs
    • *
  • 1 shared library
    • * - * + * * Shared library 1 defines {@link Handler}. WAR 1 defines {@link UppercaseHandler} which specializes {@link Handler}. Bean * {@link Alpha} packaged in WAR 1 has an injection point of type {@link Handler}. Bean {@link Bravo} packaged in WAR 2 has an * injection point of type {@link Handler}. Bean {@link Charlie} packaged in the shared library has an injection point of type * {@link Handler}. - * + * * Expected result: UnsatisfiedDependencyException - {@link Bravo} and {@link Charlie} cannot see {@link UppercaseHandler}, * {@link Handler} is not enabled - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SpecializationModularity06Test extends AbstractTest { @@ -71,7 +71,8 @@ public static EnterpriseArchive createTestArchive() { } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), @SpecAssertion(section = INTER_MODULE_INJECTION, id = "l") }) + @SpecAssertions({ @SpecAssertion(section = SELECTION, id = "aa"), + @SpecAssertion(section = INTER_MODULE_INJECTION, id = "l") }) public void testSpecialization() { } diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity07Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity07Test.java index c45f567bbc..a905f57553 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity07Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/SpecializationModularity07Test.java @@ -36,15 +36,17 @@ *
  • 2 WARs
    • *
  • 1 shared library
    • * - * - * Shared library 1 defines {@link Handler}. WAR 1 defines {@link UppercaseHandler} which specializes {@link Handler}. WAR 2 defines {@link LowercaseHandler} - * which specializes {@link Handler}. Bean {@link Alpha} packaged in WAR 1 has an injection point of type {@link Handler}. Bean {@link Bravo} packaged in WAR 2 + * + * Shared library 1 defines {@link Handler}. WAR 1 defines {@link UppercaseHandler} which specializes {@link Handler}. WAR 2 + * defines {@link LowercaseHandler} + * which specializes {@link Handler}. Bean {@link Alpha} packaged in WAR 1 has an injection point of type {@link Handler}. Bean + * {@link Bravo} packaged in WAR 2 * has an injection point of type {@link Handler}. - * + * * Expected result: Inconsistent specialization - * + * * @author Martin Kouba - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class SpecializationModularity07Test extends AbstractTest { @@ -53,7 +55,8 @@ public class SpecializationModularity07Test extends AbstractTest { @Deployment public static EnterpriseArchive createTestArchive() { - EnterpriseArchive enterpriseArchive = new EnterpriseArchiveBuilder().noDefaultWebModule().withTestClassDefinition(SpecializationModularity07Test.class) + EnterpriseArchive enterpriseArchive = new EnterpriseArchiveBuilder().noDefaultWebModule() + .withTestClassDefinition(SpecializationModularity07Test.class) .withBeanLibrary(Handler.class).withLibrary(Connector.class).build(); // WAR 1 diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization01Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization01Test.java index 3866a7f571..69d48f7c79 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization01Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization01Test.java @@ -34,12 +34,13 @@ import org.testng.annotations.Test; /** - * Originated from weld test suite. Test for specializing {@link Alternative}. Verifies that a bean is not specialized unless the specializing alternative is + * Originated from weld test suite. Test for specializing {@link Alternative}. Verifies that a bean is not specialized unless + * the specializing alternative is * enabled. - * + * * @author Jozef Hartinger * @author Matej Briskar - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class Specialization01Test extends AbstractTest { @@ -49,7 +50,9 @@ public class Specialization01Test extends AbstractTest { @Deployment public static WebArchive createTestArchive() { return new WebArchiveBuilder().withTestClass(Specialization01Test.class).withBeanLibrary(InjectedBean1.class) - .withBeanLibrary(Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class).build(); + .withBeanLibrary(Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, + FactoryEvent.class) + .build(); } @Inject @@ -62,7 +65,8 @@ public static WebArchive createTestArchive() { private Event event; @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac") }) public void testNotEnabledAlternativeDoesNotSpecialize() { assertFalse(bean1.getFactory() instanceof AlternativeSpecializedFactory); assertFalse(bean1.getProduct().isUnsatisfied()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java index b6c21e9af2..b8027e71c5 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization02Test.java @@ -25,6 +25,7 @@ import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -36,12 +37,13 @@ import org.testng.annotations.Test; /** - * Originated from weld test suite. Test for specializing {@link Alternative}. Verifies that a bean is only specialized in the BDA where the specializing + * Originated from weld test suite. Test for specializing {@link Alternative}. Verifies that a bean is only specialized in the + * BDA where the specializing * alternative is enabled. - * + * * @author Jozef Hartinger * @author Matej Briskar - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class Specialization02Test extends AbstractTest { @@ -52,7 +54,9 @@ public static WebArchive createTestArchive() { .withTestClass(Specialization02Test.class) .withBeanLibrary(InjectedBean1.class) .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), - Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class).build(); + Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, + FactoryEvent.class) + .build(); } @Inject @@ -65,8 +69,10 @@ public static WebArchive createTestArchive() { private Event event; @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), - @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "i"), @SpecAssertion(section = SPECIALIZATION, id = "ca"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), + @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "i"), + @SpecAssertion(section = SPECIALIZATION, id = "ca"), @SpecAssertion(section = SPECIALIZATION, id = "cb") }) public void testEnabledAlternativeSpecializes() { assertTrue(bean1.getFactory().isUnsatisfied()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java index c40d764663..a12f850e87 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization03Test.java @@ -25,6 +25,7 @@ import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -36,11 +37,12 @@ import org.testng.annotations.Test; /** - * Test for specializing {@link Alternative}. Verifies that a bean is only specialized in the BDA where the specializing alternative is enabled. - * + * Test for specializing {@link Alternative}. Verifies that a bean is only specialized in the BDA where the specializing + * alternative is enabled. + * * @author Jozef Hartinger * @author Matej Briskar - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class Specialization03Test extends AbstractTest { @@ -58,14 +60,18 @@ public class Specialization03Test extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(Specialization03Test.class) - .withBeanLibrary(Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class) + .withBeanLibrary(Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, + FactoryEvent.class) .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), - InjectedBean1.class).build(); + InjectedBean1.class) + .build(); } @Test(groups = INTEGRATION) - @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), - @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "i"), @SpecAssertion(section = SPECIALIZATION, id = "ca"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), + @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "i"), + @SpecAssertion(section = SPECIALIZATION, id = "ca"), @SpecAssertion(section = SPECIALIZATION, id = "cb") }) public void testEnabledAlternativeSpecializes() { assertTrue(bean1.getFactory().get() instanceof AlternativeSpecializedFactory); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java index b48076039f..1f2eeeeb7f 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization04Test.java @@ -23,6 +23,7 @@ import jakarta.enterprise.event.Event; import jakarta.enterprise.inject.Alternative; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; @@ -34,11 +35,12 @@ import org.testng.annotations.Test; /** - * Test for specializing {@link Alternative}. Verifies that a bean is only specialized in the BDA where the specializing alternative is enabled. - * + * Test for specializing {@link Alternative}. Verifies that a bean is only specialized in the BDA where the specializing + * alternative is enabled. + * * @author Jozef Hartinger * @author Matej Briskar - * + * */ @SpecVersion(spec = "cdi", version = "2.0") public class Specialization04Test extends AbstractTest { @@ -56,13 +58,16 @@ public class Specialization04Test extends AbstractTest { public static WebArchive createTestArchive() { return new WebArchiveBuilder() .withTestClass(Specialization04Test.class) - .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), Factory.class, AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class) + .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), Factory.class, + AlternativeSpecializedFactory.class, Product.class, InjectedBean2.class, FactoryEvent.class) .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), - InjectedBean1.class).build(); + InjectedBean1.class) + .build(); } @Test - @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), @SpecAssertion(section = SPECIALIZATION, id = "cb") }) public void testEnabledAlternativeSpecializes() { assertTrue(bean1.getFactory().get() instanceof AlternativeSpecializedFactory); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java index fbcb3625d0..2bcfdf7b64 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization05Test.java @@ -24,6 +24,7 @@ import jakarta.enterprise.event.Event; import jakarta.inject.Inject; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.EnterpriseArchiveBuilder; @@ -53,18 +54,21 @@ public static EnterpriseArchive createTestArchive() { .withTestClassDefinition(Specialization05Test.class) .noDefaultWebModule() .withBeanLibrary(Factory.class, Product.class, InjectedBean1.class, FactoryEvent.class) - .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), AlternativeSpecializedFactory.class) + .withBeanLibrary(new BeansXml().alternatives(AlternativeSpecializedFactory.class), + AlternativeSpecializedFactory.class) .build(); enterpriseArchive.addAsModule(new WebArchiveBuilder().notTestArchive().withDefaultEjbModuleDependency() - .withClasses(InjectedBean2.class,Specialization05Test.class).build()); + .withClasses(InjectedBean2.class, Specialization05Test.class).build()); return enterpriseArchive; } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), - @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "i"), @SpecAssertion(section = SPECIALIZATION, id = "ca"), + @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac"), + @SpecAssertion(section = DECLARING_SELECTED_ALTERNATIVES_BEAN_ARCHIVE, id = "i"), + @SpecAssertion(section = SPECIALIZATION, id = "ca"), @SpecAssertion(section = SPECIALIZATION, id = "cb") }) public void testEnabledAlternativeSpecializes() { assertTrue(bean1.getFactory().isUnsatisfied()); @@ -74,8 +78,7 @@ public void testEnabledAlternativeSpecializes() { assertTrue(bean2.getProduct().isUnsatisfied()); assertFalse(bean2.getProduct().isAmbiguous()); } - - + @Test(groups = JAVAEE_FULL) @SpecAssertions({ @SpecAssertion(section = OBSERVES, id = "a"), @SpecAssertion(section = SPECIALIZATION, id = "cc") }) public void testEvent() { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization06Test.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization06Test.java index 0351e5f041..8f8ef4e006 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization06Test.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/modules/specialization/alternative/Specialization06Test.java @@ -47,8 +47,10 @@ public class Specialization06Test extends AbstractTest { @Deployment public static EnterpriseArchive createTestArchive() { - EnterpriseArchive enterpriseArchive = new EnterpriseArchiveBuilder().withTestClassDefinition(Specialization06Test.class).noDefaultWebModule() - .withBeanLibrary(Factory.class, Product.class, InjectedBean2.class, FactoryEvent.class).withBeanLibrary(AlternativeSpecializedFactory.class) + EnterpriseArchive enterpriseArchive = new EnterpriseArchiveBuilder().withTestClassDefinition(Specialization06Test.class) + .noDefaultWebModule() + .withBeanLibrary(Factory.class, Product.class, InjectedBean2.class, FactoryEvent.class) + .withBeanLibrary(AlternativeSpecializedFactory.class) .build(); enterpriseArchive.addAsModule(new WebArchiveBuilder().notTestArchive().withDefaultEjbModuleDependency() @@ -58,7 +60,8 @@ public static EnterpriseArchive createTestArchive() { } @Test(groups = JAVAEE_FULL) - @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac") }) + @SpecAssertions({ @SpecAssertion(section = DECLARING_ALTERNATIVE, id = "aa"), + @SpecAssertion(section = SPECIALIZE_MANAGED_BEAN, id = "ac") }) public void testEnabledAlternativeSpecializes() { assertTrue(bean1.getFactory().get() instanceof Factory); assertFalse(bean1.getProduct().isUnsatisfied()); diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/Capercaillie.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/Capercaillie.java index 550954ed39..0d3d1b570e 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/Capercaillie.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/Capercaillie.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/CapercaillieLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/CapercaillieLocal.java index a7981bcdd3..f5aae6b2e8 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/CapercaillieLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/CapercaillieLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/EnterpriseResolutionByTypeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/EnterpriseResolutionByTypeTest.java index b6385a27cd..4294582d60 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/EnterpriseResolutionByTypeTest.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/EnterpriseResolutionByTypeTest.java @@ -21,11 +21,11 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.cdi.tck.AbstractTest; import org.jboss.cdi.tck.shrinkwrap.ee.WebArchiveBuilder; +import org.jboss.cdi.tck.tests.lookup.typesafe.resolution.Bird; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.test.audit.annotations.SpecAssertion; import org.jboss.test.audit.annotations.SpecVersion; import org.testng.annotations.Test; -import org.jboss.cdi.tck.tests.lookup.typesafe.resolution.Bird; @SpecVersion(spec = "cdi", version = "2.0") public class EnterpriseResolutionByTypeTest extends AbstractTest { diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/ScottishBirdLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/ScottishBirdLocal.java index ca3eed8b14..100ef7abbc 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/ScottishBirdLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/lookup/typesafe/resolution/interceptor/ejb/ScottishBirdLocal.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.tests.lookup.typesafe.resolution.interceptor.ejb; import jakarta.ejb.Local; + import org.jboss.cdi.tck.tests.lookup.typesafe.resolution.Bird; @Local diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Elephant.java b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Elephant.java index 6a948c664e..e2db3429d9 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Elephant.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Elephant.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ElephantLocal.java b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ElephantLocal.java index 1cee421243..d5d269689d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ElephantLocal.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ElephantLocal.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package org.jboss.cdi.tck.tests.vetoed.enterprise; /** diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Gecko.java b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Gecko.java index 6a3701bb19..dbc293a924 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Gecko.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/Gecko.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -17,7 +17,7 @@ import jakarta.enterprise.inject.Vetoed; /** - * + * */ @Vetoed @Stateless diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ModifyingExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ModifyingExtension.java index ecb56609b6..f1c891256d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ModifyingExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/ModifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/VerifyingExtension.java b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/VerifyingExtension.java index dced22e4b1..2fb028393d 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/VerifyingExtension.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/VerifyingExtension.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/Piranha.java b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/Piranha.java index 75bc787371..8cbb318b33 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/Piranha.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/Piranha.java @@ -6,7 +6,7 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/package-info.java b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/package-info.java index 73011745b4..2d498920cb 100644 --- a/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/package-info.java +++ b/web/src/main/java/org/jboss/cdi/tck/tests/vetoed/enterprise/aquarium/package-info.java @@ -17,4 +17,3 @@ package org.jboss.cdi.tck.tests.vetoed.enterprise.aquarium; import jakarta.enterprise.inject.Vetoed; - diff --git a/web/src/test/java/org/jboss/cdi/tck/test/ExclusionListsTest.java b/web/src/test/java/org/jboss/cdi/tck/test/ExclusionListsTest.java index f8f0ed7c25..c8500b8a75 100644 --- a/web/src/test/java/org/jboss/cdi/tck/test/ExclusionListsTest.java +++ b/web/src/test/java/org/jboss/cdi/tck/test/ExclusionListsTest.java @@ -13,20 +13,20 @@ */ package org.jboss.cdi.tck.test; -import org.testng.annotations.Test; -import org.xmlunit.builder.DiffBuilder; -import org.xmlunit.diff.ComparisonResult; -import org.xmlunit.diff.ComparisonType; -import org.xmlunit.diff.Diff; -import org.xmlunit.diff.DifferenceEvaluators; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import java.io.IOException; import java.net.URL; import java.util.ArrayList; import java.util.List; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; +import org.testng.annotations.Test; +import org.xmlunit.builder.DiffBuilder; +import org.xmlunit.diff.ComparisonResult; +import org.xmlunit.diff.ComparisonType; +import org.xmlunit.diff.Diff; +import org.xmlunit.diff.DifferenceEvaluators; public class ExclusionListsTest { @Test @@ -49,7 +49,8 @@ public void compareExclusionLists() throws IOException { return outcome; } if (comparison.getType() == ComparisonType.CHILD_NODELIST_LENGTH - && (Integer) comparison.getControlDetails().getValue() < (Integer) comparison.getTestDetails().getValue()) { + && (Integer) comparison.getControlDetails().getValue() < (Integer) comparison + .getTestDetails().getValue()) { return ComparisonResult.SIMILAR; } if (comparison.getType() == ComparisonType.CHILD_LOOKUP diff --git a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContexts.java b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContexts.java index ef4d6382b1..bd93cb3e9a 100644 --- a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContexts.java +++ b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContexts.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.test.porting; import jakarta.enterprise.context.spi.Context; + import org.jboss.cdi.tck.spi.Contexts; public class DummyContexts implements Contexts { diff --git a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java index ecec2192df..ec8ae002f0 100644 --- a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java +++ b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyContextuals.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.test.porting; import jakarta.enterprise.context.spi.Context; + import org.jboss.cdi.tck.spi.Contextuals; public class DummyContextuals implements Contextuals { diff --git a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java index a7fc0edabb..2f880a25ba 100644 --- a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java +++ b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyCreationalContexts.java @@ -14,6 +14,7 @@ package org.jboss.cdi.tck.test.porting; import jakarta.enterprise.context.spi.Contextual; + import org.jboss.cdi.tck.spi.CreationalContexts; public class DummyCreationalContexts implements CreationalContexts { diff --git a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java index 8bd137de19..3aa22ae70d 100644 --- a/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java +++ b/web/src/test/java/org/jboss/cdi/tck/test/porting/DummyEL.java @@ -15,6 +15,7 @@ import jakarta.el.ELContext; import jakarta.enterprise.inject.spi.BeanManager; + import org.jboss.cdi.tck.spi.EL; public class DummyEL implements EL { @@ -25,7 +26,8 @@ public T evaluateValueExpression(BeanManager beanManager, String expression, } @Override - public T evaluateMethodExpression(BeanManager beanManager, String expression, Class expectedType, Class[] expectedParamTypes, + public T evaluateMethodExpression(BeanManager beanManager, String expression, Class expectedType, + Class[] expectedParamTypes, Object[] expectedParams) { throw new UnsupportedOperationException(); } diff --git a/web/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/descriptors/ejb/EjbJarDescriptorBuilderTest.java b/web/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/descriptors/ejb/EjbJarDescriptorBuilderTest.java index c770bbbe77..f3ce6df980 100644 --- a/web/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/descriptors/ejb/EjbJarDescriptorBuilderTest.java +++ b/web/src/test/java/org/jboss/cdi/tck/test/shrinkwrap/descriptors/ejb/EjbJarDescriptorBuilderTest.java @@ -60,7 +60,8 @@ public void testDescriptorIsValid() throws ParserConfigurationException, SAXExce newMessageDriven("TestTopic", TopicMessageDrivenBean.class.getName()) .addActivationConfigProperty("acknowledgeMode", "Auto-acknowledge") .addActivationConfigProperty("destinationType", "jakarta.jms.Topic") - .addActivationConfigProperty("destinationLookup", "test_topic")).build(); + .addActivationConfigProperty("destinationLookup", "test_topic")) + .build(); SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); schemaFactory.setResourceResolver(new LSResourceResolver() {