From 8a297f72b939b738085764c3c69e72570b4b1aa3 Mon Sep 17 00:00:00 2001 From: Matej Novotny Date: Wed, 13 Sep 2023 16:29:51 +0200 Subject: [PATCH] Introduce formatter instead of checkstyle, apply code formatting where needed. --- .gitignore | 1 + .../weld/environment/ContainerInstance.java | 3 +- .../deployment/AbstractWeldDeployment.java | 3 +- .../deployment/WeldBeanDeploymentArchive.java | 14 +- .../deployment/WeldDeployment.java | 15 +- .../discovery/AbstractDiscoveryStrategy.java | 11 +- .../discovery/BeanArchiveBuilder.java | 6 +- .../discovery/BeanArchiveHandler.java | 9 +- .../discovery/BeanArchiveScanner.java | 6 +- .../ClassPathBeanArchiveScanner.java | 3 +- .../discovery/DefaultBeanArchiveScanner.java | 11 +- .../discovery/DiscoveryStrategy.java | 8 +- .../discovery/DiscoveryStrategyFactory.java | 14 +- .../FileSystemBeanArchiveHandler.java | 15 +- .../ReflectionDiscoveryStrategy.java | 7 +- .../deployment/discovery/jandex/Jandex.java | 7 +- .../discovery/jandex/JandexClassFileInfo.java | 13 +- .../jandex/JandexClassFileServices.java | 3 +- .../jandex/JandexDiscoveryStrategy.java | 7 +- .../discovery/jandex/SecurityActions.java | 6 +- .../discovery/jandex/package-info.java | 2 +- .../deployment/discovery/package-info.java | 2 +- .../environment/deployment/package-info.java | 2 +- .../environment/logging/CommonLogger.java | 1 - .../environment/logging/package-info.java | 2 +- .../jboss/weld/environment/package-info.java | 2 +- .../weld/environment/util/BeanArchives.java | 9 +- .../weld/environment/util/Reflections.java | 18 +- .../weld/environment/util/package-info.java | 2 +- .../discovery/DiscoveryStrategyTest.java | 3 +- .../environment/util/BeanArchivesTest.java | 17 +- .../environment/util/ReflectionsTest.java | 9 +- .../se/ContainerLifecycleObserver.java | 21 +- .../jboss/weld/environment/se/StartMain.java | 7 +- .../org/jboss/weld/environment/se/Weld.java | 171 +++--- .../weld/environment/se/WeldContainer.java | 25 +- .../environment/se/WeldSEBeanRegistrant.java | 9 +- .../se/beans/ParametersFactory.java | 4 +- .../environment/se/bindings/Parameters.java | 11 +- .../environment/se/bindings/package-info.java | 2 +- .../environment/se/contexts/ThreadScoped.java | 13 +- .../environment/se/contexts/package-info.java | 2 +- .../se/events/ContainerInitialized.java | 3 +- .../environment/se/events/package-info.java | 2 +- .../environment/se/logging/WeldSELogger.java | 6 +- .../environment/se/logging/package-info.java | 2 +- .../se/threading/RunnableDecorator.java | 3 - .../environment/se/test/StartMainTest.java | 2 +- .../BeanDiscoveryInjectionTest.java | 11 +- .../BeanDiscoveryWithJandexIndexTest.java | 9 +- .../BeanDiscoveryWithoutIsolationTest.java | 29 +- .../se/test/beandiscovery/Dog.java | 1 + .../BeanDiscoveryAlternativeTest.java | 9 +- .../BeanDiscoveryDecorator02Test.java | 21 +- .../BeanDiscoveryDecorator03Test.java | 21 +- .../BeanDiscoveryDecoratorTest.java | 18 +- .../BeanDiscoveryInterceptor02Test.java | 14 +- .../BeanDiscoveryInterceptor03Test.java | 12 +- .../BeanDiscoveryInterceptorTest.java | 15 +- .../interceptors/ScopedInterceptor.java | 1 + .../DisabledIsolationPriorityTest.java | 2 +- .../beandiscovery/priority/Normalized.java | 6 +- .../beandiscovery/priority/SoundSource.java | 2 +- .../se/test/beans/InitObserverTestBean.java | 4 +- .../se/test/beans/ParametersTestBean.java | 9 +- .../threading/AbstractThreadContextTest.java | 1 - .../ThreadContextImplicitBeanArchiveTest.java | 3 +- .../builder/BuilderInterceptorBinding.java | 3 +- .../environment/se/test/builder/Juicy.java | 2 +- .../se/test/builder/WeldBuilderTest.java | 33 +- .../ContainerLifecyleObserverTest.java | 34 +- .../ExplicitClassLoaderScanningTest.java | 12 +- .../ExplicitResourceLoaderScanningTest.java | 12 +- .../container/events/ContainerEventsTest.java | 7 +- .../container/events/ContainerObserver.java | 12 +- .../isolation/ContainerIsolationTest.java | 3 +- .../provider/WeldSEProviderTest.java | 4 +- .../se/test/events/EventQualifier1.java | 11 +- .../se/test/events/EventQualifier2.java | 11 +- .../se/test/executor/DefaultExecutorTest.java | 3 +- .../se/test/inheritance/Plant.java | 16 +- .../PostConstructInheritanceTest.java | 24 +- .../environment/se/test/inheritance/Tree.java | 6 +- .../se/test/instance/SimpleInstanceTest.java | 2 +- .../se/test/interceptors/Aggregated.java | 11 +- .../se/test/interceptors/Recorded.java | 11 +- .../interceptors/RecordingInterceptor.java | 5 +- .../se/test/interceptors/Tracked.java | 11 +- ...nterceptorEnabledForAppAndArchiveTest.java | 4 +- .../enablement/Transactional.java | 2 +- .../environment/se/test/isolation/Camera.java | 2 +- .../se/test/isolation/CameraDecorator.java | 6 +- .../se/test/isolation/Digital.java | 4 +- .../test/isolation/IsolationDisabledTest.java | 6 +- .../environment/se/test/isolation/Zoom.java | 4 +- .../test/provider/BasicCDIProviderTest.java | 3 +- .../environment/se/test/provider/Female.java | 76 +-- .../environment/se/test/provider/Male.java | 72 +-- .../provider/MultiModuleCDIProviderTest.java | 3 +- .../environment/se/test/provider/Pretty.java | 72 +-- .../se/test/provider/PrettyLiteral.java | 60 +-- .../provider/custom/CustomCDIProvider.java | 6 +- .../se/test/provider/custom/TestCDI.java | 3 +- .../se/test/scopes/ScopesTest.java | 1 - .../se/test/unmanaged/UnmanagedTest.java | 3 +- .../se/test/cleanup/OptimizedCleanupTest.java | 10 +- .../se/test/cleanup/TestExtension.java | 16 +- .../ContextPropagationSEService.java | 6 +- .../propagation/ContextPropagationSETest.java | 5 +- .../se/test/context/requestScope/Baz.java | 1 - .../se/test/context/requestScope/Foo.java | 1 - .../RequestScopedActiveInterceptorTest.java | 3 +- .../requestScope/postConstruct/Beta.java | 4 +- ...ontextEventsFiredForPostConstructTest.java | 4 +- .../requestScope/postConstruct/Gama.java | 2 +- .../ThreadScopedActiveInterceptorTest.java | 3 +- .../DecoratorWithPrivateConstructorTest.java | 21 +- .../errors/MultipleDeploymentErrorsTest.java | 3 +- .../errors/SingleDeploymentErrorTest.java | 3 +- ...AdditionalBeanDefiningAnnotationsTest.java | 24 +- .../discovery/beansXml/empty/legacy/Bar.java | 2 +- .../discovery/beansXml/empty/legacy/Foo.java | 4 +- .../empty/legacy/LegacyEmptyBeansXmlTest.java | 6 +- .../JandexDiscoveryStrategyDisabledTest.java | 9 +- .../AdditionalBeanArchiveHandlerTest.java | 7 +- .../isolation/IsolationDisabledTest.java | 3 +- ...ntheticArchiveDiscoveryModeChangeTest.java | 9 +- .../synthetic/bdm/discoveredPackage/Foo.java | 2 +- .../synthetic/bdm/hiddenPackage/Bar.java | 2 +- .../withAnnotations/UselessStereotype.java | 2 +- .../withAnnotations/WithAnnotationsTest.java | 7 +- ...yncEventNotificationPreservesTCCLTest.java | 18 +- .../container/lifecycle/ObservingBean.java | 6 +- .../lifecycle/StartupShutdownTest.java | 7 +- .../se/test/event/enhanced/ObservingBean.java | 28 +- .../se/test/event/enhanced/WeldEventTest.java | 4 +- .../options/mode/NotificationModeTest.java | 15 +- .../IncompleteCustomExecutorServices.java | 2 +- .../timeout/NotificationTimeoutTest.java | 69 +-- .../BuildCompatibleExtensionSmokeTest.java | 7 +- .../compatible/none/TestNoExtensionFound.java | 9 +- .../test/implicit/ImplicitScanSmokeTest.java | 3 +- .../ImplicitScanSystemPropertySmokeTest.java | 9 +- .../ImplicitScanBeanArchiveDirectoryTest.java | 4 +- .../disabled/ImplicitScanDisabledTest.java | 6 +- ...ImplicitScanBeanDiscoveryModeNoneTest.java | 9 +- .../se/test/instance/enhanced/Bravo.java | 1 - .../instance/enhanced/FirstProcessor.java | 2 +- .../instance/enhanced/InstanceHandleTest.java | 23 +- .../se/test/instance/enhanced/Priority1.java | 1 - .../se/test/instance/enhanced/WeldClient.java | 5 +- .../instance/enhanced/WeldInstanceTest.java | 23 +- .../instance/enhanced/selectType/Bar.java | 2 +- .../instance/enhanced/selectType/Foo.java | 3 +- .../enhanced/selectType/TypedBean.java | 4 +- .../WeldInstanceSelectTypeTest.java | 19 +- .../EEResourceInjectionIgnoredTest.java | 4 +- .../environment/se/test/resource/Golf.java | 2 +- ...licitClassLoaderExtensionScanningTest.java | 6 +- ...itResourceLoaderExtensionScanningTest.java | 6 +- .../test/service/AdditionalServiceTest.java | 21 +- .../se/test/service/ExecutorServices1.java | 1 - .../ContextClassLoaderNullifiedTest.java | 14 +- .../hook/AbstractShutdownHookTest.java | 6 +- .../se/test/shutdown/hook/Observer.java | 4 +- .../ShutdownHookNotRegisteredBuilderTest.java | 3 +- ...wnHookNotRegisteredSystemPropertyTest.java | 4 +- .../hook/ShutdownHookNotRegisteredTest.java | 6 +- ...downHookRegisteredBeforeInitEventTest.java | 2 +- .../test/shutdown/hook/ShutdownHookTest.java | 2 +- .../shutdown/hook/UndertowTestServer.java | 9 +- ...SyntheticBeanArchiveFromDirectoryTest.java | 6 +- ...yntheticArchiveWithPackageFromJarTest.java | 6 +- .../synthethic/jarHandling/foo/ImplOne.java | 1 + .../jarHandling/foobar/ImplTwo.java | 1 + .../testpackage/AlphaFromDirectory.java | 2 +- .../testpackage/nested/BetaFromDirectory.java | 2 +- .../contextActive/IsContextActiveTest.java | 7 +- .../GetContextUtilMethodsTest.java | 8 +- .../injectable/InjectWeldManagerTest.java | 5 +- .../test/weldManager/injectable/SomeBean.java | 2 +- .../weldManager/scopes/GetScopesTests.java | 5 +- .../environment/jetty/JettyContainer.java | 20 +- .../jetty/JettyLegacyContainer.java | 18 +- .../environment/jetty/JettyWeldInjector.java | 34 +- .../jetty/LegacyWeldDecorator.java | 14 +- .../weld/environment/jetty/WeldDecorator.java | 23 +- .../BeanManagerResourceBindingListener.java | 5 +- .../weld/environment/servlet/Container.java | 1 - .../environment/servlet/ContainerContext.java | 1 - .../environment/servlet/EnhancedListener.java | 12 +- .../weld/environment/servlet/Listener.java | 27 +- .../environment/servlet/SecurityActions.java | 10 +- .../environment/servlet/WeldProvider.java | 3 +- .../servlet/WeldServletLifecycle.java | 59 +- .../ServletContextBeanArchiveHandler.java | 6 +- .../deployment/WebAppBeanArchiveScanner.java | 8 +- .../servlet/inject/AbstractInjector.java | 6 +- .../servlet/jsf/WeldApplication.java | 5 +- .../servlet/jsf/WeldApplicationFactory.java | 1 - .../servlet/logging/TomcatLogger.java | 2 +- .../servlet/logging/UndertowLogger.java | 12 +- .../ServletResourceInjectionServices.java | 8 +- .../servlet/util/ForwardingELResolver.java | 5 +- .../environment/servlet/util/Servlets.java | 3 +- .../servlet/util/TransparentELResolver.java | 5 +- .../tomcat/ForwardingInstanceManager.java | 9 +- .../environment/tomcat/TomcatContainer.java | 3 +- .../tomcat/WeldForwardingInstanceManager.java | 16 +- .../tomcat/WeldInstanceManager.java | 9 +- .../undertow/WeldInstanceFactory.java | 9 +- .../undertow/WeldServletExtension.java | 21 +- .../servlet/undertow/InjectedFilter.java | 3 +- .../servlet/undertow/UndertowSmokeTest.java | 9 +- .../test/bootstrap/BootstrapOrderingTest.java | 7 +- .../servlet/test/bootstrap/MyExtension.java | 1 - .../BeansXmlAlternativeLocationTest.java | 3 +- .../beansxml/ConflictingBeansXmlTest.java | 3 +- .../bootstrap/beansxml/VerifyExtension.java | 1 - ...mmonExecutorServicesConfigurationTest.java | 15 +- ...dThreadPoolBootstrapConfigurationTest.java | 6 +- .../DuplicateBeansXmlMergingTest.java | 4 +- .../duplicates/SimpleInterceptor.java | 1 - .../enhanced/EnhancedListenerTest.java | 9 +- .../EnhancedListenerShutdownTest.java | 13 +- .../servlet/test/config/ConfigTest.java | 3 +- .../test/context/async/FailingServlet.java | 1 - .../context/async/SimpleAsyncListener.java | 2 +- .../async/SimpleAsyncListenerTest.java | 3 +- .../test/context/async/StatusServlet.java | 9 +- .../crosscontext/CrossContextForwardTest.java | 8 +- .../test/crosscontext/ForwardingServlet.java | 5 +- .../test/crosscontext/IncludedServlet.java | 1 - .../AdditionalBeanDeploymentArchiveTest.java | 9 +- .../discovery/BeanDiscoveryInjectionTest.java | 9 +- .../servlet/test/discovery/Dog.java | 1 - .../servlet/test/discovery/Stone.java | 1 - .../AlternativeDiscoveryTest.java | 6 +- .../decorators/DecoratorDiscoveryTest.java | 6 +- .../InterceptorDiscoveryTest.java | 3 +- .../scope/CustomNormalScopeDiscoveryTest.java | 3 +- .../StereotypeDiscoveryTestBase.java | 3 +- .../environment/servlet/test/el/JsfTest.java | 2 +- .../servlet/test/examples/Game.java | 1 - .../test/examples/MockExampleTest.java | 6 +- .../servlet/test/examples/Random.java | 2 +- .../servlet/test/examples/TextTranslator.java | 1 - .../servlet/test/examples/Translator.java | 1 - .../servlet/test/injection/BatListener.java | 30 +- .../test/injection/BatRequestListener.java | 36 +- .../servlet/test/injection/BatServlet.java | 65 +-- .../injection/BatServletContextListener.java | 36 +- .../test/injection/BatSessionListener.java | 36 +- .../servlet/test/injection/CatFilter.java | 69 +-- .../test/injection/FilterInjectionTest.java | 119 ++-- .../test/injection/ListenerInjectionTest.java | 163 +++--- .../servlet/test/injection/LookupTest.java | 1 - .../servlet/test/injection/Mouse.java | 3 +- .../servlet/test/injection/RatServlet.java | 3 +- .../test/injection/ServletInjectionTest.java | 5 +- .../test/injection/WolverineServlet.java | 3 +- .../resource/ResourceInjectionTest.java | 3 +- .../servlet/test/isolation/Digital.java | 2 +- .../test/isolation/IsolationDisabledTest.java | 20 +- .../servlet/test/isolation/Zoom.java | 2 +- .../libraries/LibrariesDiscoveredTest.java | 6 +- .../servlet/test/lifecycle/HSListener.java | 6 +- .../test/provider/CustomCDIProvider.java | 6 +- .../servlet/test/provider/Female.java | 76 +-- .../servlet/test/provider/Male.java | 72 +-- .../servlet/test/provider/Pretty.java | 72 +-- .../servlet/test/provider/TestCDI.java | 3 +- .../servlet/test/util/Deployments.java | 9 +- .../servlet/test/TomcatArchiveProcessor.java | 3 +- .../servlet/test/util/TomcatDeployments.java | 13 +- .../main/java/org/jboss/weld/AbstractCDI.java | 9 +- .../main/java/org/jboss/weld/Container.java | 6 +- .../main/java/org/jboss/weld/SimpleCDI.java | 1 - .../annotated/AnnotatedTypeValidator.java | 7 +- .../jboss/weld/annotated/EmptyAnnotated.java | 2 +- .../annotated/enhanced/EnhancedAnnotated.java | 17 +- .../enhanced/EnhancedAnnotatedCallable.java | 5 +- .../EnhancedAnnotatedConstructor.java | 5 +- .../enhanced/EnhancedAnnotatedField.java | 1 + .../enhanced/EnhancedAnnotatedMember.java | 1 + .../enhanced/EnhancedAnnotatedMethod.java | 1 + .../enhanced/EnhancedAnnotatedParameter.java | 1 + .../enhanced/EnhancedAnnotatedType.java | 23 +- .../annotated/enhanced/MethodSignature.java | 1 + .../jlr/AbstractEnhancedAnnotated.java | 40 +- .../AbstractEnhancedAnnotatedCallable.java | 11 +- .../jlr/AbstractEnhancedAnnotatedMember.java | 17 +- .../jlr/EnhancedAnnotatedConstructorImpl.java | 23 +- .../jlr/EnhancedAnnotatedFieldImpl.java | 16 +- .../jlr/EnhancedAnnotatedMethodImpl.java | 28 +- .../jlr/EnhancedAnnotatedParameterImpl.java | 15 +- .../jlr/EnhancedAnnotatedTypeImpl.java | 81 ++- .../enhanced/jlr/EnhancedAnnotationImpl.java | 16 +- .../enhanced/jlr/MethodSignatureImpl.java | 5 +- .../annotated/enhanced/jlr/package-info.java | 2 +- .../weld/annotated/enhanced/package-info.java | 2 +- .../jboss/weld/annotated/package-info.java | 2 +- .../runtime/InvokableAnnotatedMethod.java | 13 +- .../annotated/runtime/SecurityActions.java | 1 - .../weld/annotated/runtime/package-info.java | 2 +- .../slim/AnnotatedTypeIdentifier.java | 40 +- .../annotated/slim/SlimAnnotatedType.java | 6 +- .../slim/SlimAnnotatedTypeContext.java | 9 +- .../slim/SlimAnnotatedTypeStoreImpl.java | 1 - .../slim/backed/BackedAnnotatedCallable.java | 6 +- .../backed/BackedAnnotatedConstructor.java | 18 +- .../slim/backed/BackedAnnotatedField.java | 9 +- .../slim/backed/BackedAnnotatedMember.java | 6 +- .../slim/backed/BackedAnnotatedMethod.java | 6 +- .../slim/backed/BackedAnnotatedParameter.java | 12 +- .../slim/backed/BackedAnnotatedType.java | 16 +- .../annotated/slim/backed/package-info.java | 2 +- .../weld/annotated/slim/package-info.java | 2 +- .../UnbackedAnnotatedConstructor.java | 21 +- .../slim/unbacked/UnbackedAnnotatedField.java | 12 +- .../unbacked/UnbackedAnnotatedMember.java | 3 +- .../unbacked/UnbackedAnnotatedMethod.java | 18 +- .../unbacked/UnbackedAnnotatedParameter.java | 6 +- .../slim/unbacked/UnbackedAnnotatedType.java | 12 +- .../unbacked/UnbackedMemberIdentifier.java | 1 + .../annotated/slim/unbacked/package-info.java | 2 +- .../org/jboss/weld/bean/AbstractBean.java | 6 +- .../jboss/weld/bean/AbstractClassBean.java | 8 +- .../jboss/weld/bean/AbstractProducerBean.java | 23 +- .../org/jboss/weld/bean/BeanIdentifiers.java | 12 +- .../java/org/jboss/weld/bean/ClassBean.java | 2 + .../jboss/weld/bean/ContextualInstance.java | 1 + .../weld/bean/ContextualInstanceStrategy.java | 15 +- .../weld/bean/CustomDecoratorWrapper.java | 3 +- .../org/jboss/weld/bean/DecoratedMethods.java | 10 +- .../org/jboss/weld/bean/DecoratorImpl.java | 11 +- .../org/jboss/weld/bean/DisposalMethod.java | 30 +- .../org/jboss/weld/bean/InterceptorImpl.java | 31 +- .../java/org/jboss/weld/bean/ManagedBean.java | 29 +- .../org/jboss/weld/bean/ProducerField.java | 23 +- .../org/jboss/weld/bean/ProducerMethod.java | 24 +- .../java/org/jboss/weld/bean/SessionBean.java | 3 + .../jboss/weld/bean/SyntheticBeanFactory.java | 21 +- .../jboss/weld/bean/SyntheticClassBean.java | 3 +- .../jboss/weld/bean/SyntheticDecorator.java | 3 +- .../weld/bean/SyntheticProducerBean.java | 3 +- .../java/org/jboss/weld/bean/WeldBean.java | 1 + .../org/jboss/weld/bean/WeldDecorator.java | 1 - .../attributes/BeanAttributesFactory.java | 3 +- .../ExternalBeanAttributesFactory.java | 13 +- .../attributes/ImmutableBeanAttributes.java | 9 +- .../weld/bean/attributes/package-info.java | 2 +- .../bean/builtin/AbstractBuiltInBean.java | 3 +- .../builtin/AbstractDecorableBuiltInBean.java | 3 +- .../weld/bean/builtin/AbstractFacade.java | 4 +- .../weld/bean/builtin/AbstractFacadeBean.java | 3 +- ...bstractStaticallyDecorableBuiltInBean.java | 3 +- .../weld/bean/builtin/BeanManagerBean.java | 5 +- .../bean/builtin/BeanManagerImplBean.java | 5 +- .../weld/bean/builtin/BeanManagerProxy.java | 8 +- .../jboss/weld/bean/builtin/ContextBean.java | 4 +- .../weld/bean/builtin/ConversationBean.java | 8 +- .../builtin/DecoratedBeanMetadataBean.java | 3 +- .../bean/builtin/DecoratorMetadataBean.java | 3 +- .../jboss/weld/bean/builtin/EventBean.java | 7 +- .../weld/bean/builtin/EventMetadataBean.java | 2 +- .../weld/bean/builtin/ExtensionBean.java | 3 +- .../bean/builtin/FacadeInjectionPoint.java | 5 +- .../jboss/weld/bean/builtin/InstanceBean.java | 5 +- .../jboss/weld/bean/builtin/InstanceImpl.java | 19 +- .../builtin/InterceptedBeanMetadataBean.java | 3 +- .../bean/builtin/InterceptionFactoryBean.java | 6 +- .../bean/builtin/InterceptorMetadataBean.java | 3 +- .../builtin/RequestContextControllerBean.java | 3 +- .../weld/bean/builtin/ee/AbstractEEBean.java | 3 +- .../bean/builtin/ee/AbstractEECallable.java | 4 +- .../builtin/ee/EEResourceProducerField.java | 26 +- .../ee/StaticEEResourceProducerField.java | 9 +- .../weld/bean/builtin/ee/package-info.java | 2 +- .../jboss/weld/bean/builtin/package-info.java | 2 +- .../CustomInterceptorMetadata.java | 11 +- .../InterceptorBindingsAdapter.java | 9 +- .../weld/bean/interceptor/package-info.java | 2 +- .../org/jboss/weld/bean/package-info.java | 2 +- .../jboss/weld/bean/proxy/BeanInstance.java | 2 +- .../bean/proxy/BytecodeMethodResolver.java | 3 +- .../weld/bean/proxy/ClientProxyFactory.java | 21 +- .../weld/bean/proxy/ClientProxyProvider.java | 19 +- ...rceptorAndDecoratorStackMethodHandler.java | 3 +- .../proxy/CommonProxiedMethodFilters.java | 6 +- .../weld/bean/proxy/ContextBeanInstance.java | 5 +- .../weld/bean/proxy/DecorationHelper.java | 16 +- .../bean/proxy/DecoratorProxyFactory.java | 43 +- .../proxy/DecoratorProxyMethodHandler.java | 24 +- .../proxy/DefaultBytecodeMethodResolver.java | 12 +- .../bean/proxy/DefaultProxyInstantiator.java | 8 +- .../bean/proxy/DummyClassFactoryImpl.java | 7 +- .../proxy/EnterpriseTargetBeanInstance.java | 6 +- .../bean/proxy/InterceptedProxyFactory.java | 40 +- .../proxy/InterceptedSubclassFactory.java | 100 ++-- .../proxy/InterceptionDecorationContext.java | 30 +- .../proxy/InterceptionFactoryDataCache.java | 15 +- .../org/jboss/weld/bean/proxy/Marker.java | 3 +- .../jboss/weld/bean/proxy/MethodHandler.java | 31 +- .../bean/proxy/ProtectionDomainCache.java | 4 +- .../weld/bean/proxy/ProxiedMethodFilter.java | 2 + .../jboss/weld/bean/proxy/ProxyFactory.java | 85 +-- .../weld/bean/proxy/ProxyInstantiator.java | 18 +- .../weld/bean/proxy/ProxyMethodHandler.java | 13 +- .../jboss/weld/bean/proxy/ProxyObject.java | 2 +- .../ReflectionFactoryProxyInstantiator.java | 6 +- ...nterceptionDecorationContextGenerator.java | 23 +- .../bean/proxy/StackAwareMethodHandler.java | 9 +- .../bean/proxy/UnsafeProxyInstantiator.java | 8 +- .../jboss/weld/bean/proxy/package-info.java | 2 +- .../proxy/util/SerializableClientProxy.java | 3 +- .../proxy/util/WeldDefaultProxyServices.java | 24 +- .../weld/bean/proxy/util/package-info.java | 2 +- .../weld/bootstrap/AbstractBeanDeployer.java | 32 +- .../bootstrap/AdditionalServiceLoader.java | 16 +- .../weld/bootstrap/AnnotatedTypeLoader.java | 9 +- .../jboss/weld/bootstrap/BeanDeployer.java | 21 +- .../bootstrap/BeanDeployerEnvironment.java | 18 +- .../BeanDeployerEnvironmentFactory.java | 9 +- .../jboss/weld/bootstrap/BeanDeployment.java | 39 +- .../BeanDeploymentArchiveMapping.java | 4 +- .../weld/bootstrap/BeanDeploymentFinder.java | 3 +- .../weld/bootstrap/BeanDeploymentModule.java | 22 +- .../weld/bootstrap/BeanDeploymentModules.java | 9 +- .../jboss/weld/bootstrap/BeanDeployments.java | 1 + .../bootstrap/ConcurrentBeanDeployer.java | 26 +- .../weld/bootstrap/ConcurrentValidator.java | 6 +- .../jboss/weld/bootstrap/ContextHolder.java | 3 +- .../weld/bootstrap/DeploymentVisitor.java | 7 +- .../weld/bootstrap/ExtensionBeanDeployer.java | 20 +- .../bootstrap/FastAnnotatedTypeLoader.java | 19 +- .../FastProcessAnnotatedTypeResolver.java | 33 +- .../ObserverInitializationContext.java | 3 +- .../SpecializationAndEnablementRegistry.java | 25 +- .../bootstrap/SpecializedBeanResolver.java | 6 +- .../weld/bootstrap/SyntheticExtension.java | 3 +- .../org/jboss/weld/bootstrap/Trackers.java | 3 +- .../org/jboss/weld/bootstrap/Validator.java | 164 ++++-- .../jboss/weld/bootstrap/WeldBootstrap.java | 5 +- .../jboss/weld/bootstrap/WeldExtension.java | 2 +- .../org/jboss/weld/bootstrap/WeldRuntime.java | 26 +- .../org/jboss/weld/bootstrap/WeldStartup.java | 109 ++-- .../WeldUnusedMetadataExtension.java | 6 +- .../enablement/EnablementListView.java | 9 +- .../enablement/GlobalEnablementBuilder.java | 47 +- .../jboss/weld/bootstrap/enablement/Item.java | 3 +- .../enablement/ModuleEnablement.java | 7 +- .../bootstrap/enablement/package-info.java | 2 +- ...AbstractAnnotatedTypeRegisteringEvent.java | 4 +- .../events/AbstractBeanDiscoveryEvent.java | 4 +- .../AbstractDefinitionContainerEvent.java | 6 +- .../events/AbstractProcessClassBean.java | 3 +- .../AbstractProcessInjectionTarget.java | 17 +- .../events/AbstractProcessProducerBean.java | 12 +- .../events/AfterBeanDiscoveryImpl.java | 13 +- .../events/AfterTypeDiscoveryImpl.java | 9 +- .../events/BeforeBeanDiscoveryImpl.java | 16 +- .../events/BuilderInterceptorBean.java | 12 +- .../weld/bootstrap/events/ContainerEvent.java | 3 +- .../ContainerLifecycleEventPreloader.java | 12 +- .../events/ContainerLifecycleEvents.java | 35 +- .../events/InterceptorConfiguratorImpl.java | 6 +- .../ProcessAnnotatedTypeEventResolvable.java | 38 +- .../events/ProcessAnnotatedTypeImpl.java | 12 +- .../events/ProcessBeanAttributesImpl.java | 12 +- .../bootstrap/events/ProcessBeanImpl.java | 2 +- .../events/ProcessBeanInjectionTarget.java | 6 +- .../events/ProcessInjectionPointImpl.java | 24 +- .../events/ProcessManagedBeanImpl.java | 9 +- .../events/ProcessObserverMethodImpl.java | 12 +- .../events/ProcessProducerFieldImpl.java | 6 +- .../bootstrap/events/ProcessProducerImpl.java | 6 +- .../events/ProcessProducerMethodImpl.java | 8 +- .../events/ProcessSessionBeanImpl.java | 5 +- .../events/ProcessSimpleInjectionTarget.java | 9 +- .../events/ProcessSynthethicBeanImpl.java | 1 + .../ProcessSyntheticAnnotatedTypeImpl.java | 3 +- .../ProcessSyntheticObserverMethodImpl.java | 9 +- .../events/RequiredAnnotationDiscovery.java | 33 +- .../AnnotatedCallableConfigurator.java | 3 +- .../AnnotatedConstructorConfiguratorImpl.java | 3 +- .../AnnotatedFieldConfiguratorImpl.java | 3 +- .../AnnotatedMethodConfiguratorImpl.java | 3 +- .../AnnotatedParameterConfiguratorImpl.java | 3 +- .../AnnotatedTypeBuilderImpl.java | 18 +- .../AnnotatedTypeConfiguratorImpl.java | 12 +- .../BeanAttributesConfiguratorImpl.java | 3 +- .../configurator/BeanConfiguratorImpl.java | 14 +- .../events/configurator/Configurators.java | 3 +- .../InjectionPointConfiguratorImpl.java | 148 ++--- .../ObserverMethodConfiguratorImpl.java | 201 +++---- .../ProducerConfiguratorImpl.java | 52 +- .../weld/bootstrap/events/package-info.java | 2 +- .../jboss/weld/bootstrap/package-info.java | 2 +- .../jboss/weld/config/ConfigurationKey.java | 97 ++-- .../config/SystemPropertiesConfiguration.java | 3 +- .../jboss/weld/config/WeldConfiguration.java | 64 ++- .../org/jboss/weld/config/package-info.java | 2 +- .../jboss/weld/contexts/AbstractContext.java | 5 +- .../contexts/AbstractConversationContext.java | 71 ++- .../weld/contexts/AbstractManagedContext.java | 3 +- .../weld/contexts/CreationalContextImpl.java | 31 +- .../contexts/PassivatingContextWrapper.java | 6 +- .../SerializableContextualFactory.java | 48 +- .../SerializableContextualInstanceImpl.java | 6 +- .../weld/contexts/WeldCreationalContext.java | 4 +- ...CdiRequestContextActivatorInterceptor.java | 3 +- .../beanstore/AttributeBeanStore.java | 11 +- .../weld/contexts/beanstore/BeanStore.java | 2 + .../beanstore/ConcurrentHashMapBeanStore.java | 4 +- .../beanstore/ConversationNamingScheme.java | 1 - .../contexts/beanstore/HashMapBeanStore.java | 116 ++-- .../weld/contexts/beanstore/LockStore.java | 5 +- .../weld/contexts/beanstore/MapBeanStore.java | 4 +- .../beanstore/SessionMapBeanStore.java | 6 +- .../beanstore/SimpleNamingScheme.java | 4 +- .../weld/contexts/beanstore/package-info.java | 2 +- .../bound/BoundConversationContextImpl.java | 7 +- .../bound/BoundRequestContextImpl.java | 2 +- .../bound/BoundSessionContextImpl.java | 2 +- .../weld/contexts/bound/package-info.java | 2 +- .../weld/contexts/cache/package-info.java | 2 +- .../conversation/ConversationImpl.java | 3 +- .../contexts/conversation/package-info.java | 2 +- .../org/jboss/weld/contexts/package-info.java | 2 +- .../unbound/ApplicationContextImpl.java | 6 +- .../unbound/DependentContextImpl.java | 8 +- .../contexts/unbound/RequestContextImpl.java | 11 +- .../unbound/SingletonContextImpl.java | 6 +- .../weld/contexts/unbound/package-info.java | 2 +- .../weld/event/AsyncEventDeliveryStage.java | 24 +- .../org/jboss/weld/event/ContextEvent.java | 6 +- .../event/DefaultObserverNotifierFactory.java | 3 +- .../java/org/jboss/weld/event/EventImpl.java | 21 +- .../jboss/weld/event/EventMetadataImpl.java | 3 +- .../event/ExtensionObserverMethodImpl.java | 36 +- .../java/org/jboss/weld/event/FastEvent.java | 25 +- .../event/GlobalObserverNotifierService.java | 6 +- .../org/jboss/weld/event/ObserverFactory.java | 9 +- .../jboss/weld/event/ObserverMethodImpl.java | 37 +- .../jboss/weld/event/ObserverNotifier.java | 121 +++-- .../jboss/weld/event/ResolvedObservers.java | 23 +- .../org/jboss/weld/event/SecurityActions.java | 4 +- .../org/jboss/weld/event/package-info.java | 2 +- .../weld/exceptions/DefinitionException.java | 2 +- .../weld/exceptions/DeploymentException.java | 2 +- .../InconsistentSpecializationException.java | 3 - .../weld/exceptions/InjectionException.java | 2 +- .../exceptions/InvalidObjectException.java | 1 - .../exceptions/NullInstanceException.java | 2 +- .../UnserializableDependencyException.java | 1 - .../UnsupportedOperationException.java | 2 +- .../jboss/weld/exceptions/WeldException.java | 2 +- .../exceptions/WeldExceptionListMessage.java | 2 +- .../weld/exceptions/WeldExceptionMessage.java | 2 +- .../WeldExceptionStringMessage.java | 8 +- .../jboss/weld/exceptions/package-info.java | 2 +- .../executor/AbstractExecutorServices.java | 13 +- .../weld/executor/DaemonThreadFactory.java | 3 +- .../executor/ExecutorServicesFactory.java | 12 +- .../FixedThreadPoolExecutorServices.java | 3 +- .../executor/ProfilingExecutorServices.java | 3 +- .../jboss/weld/executor/SecurityActions.java | 32 +- .../SingleThreadExecutorServices.java | 3 - ...ingOutFixedThreadPoolExecutorServices.java | 3 +- .../org/jboss/weld/executor/package-info.java | 2 +- .../AbstractCallableInjectionPoint.java | 7 +- .../injection/ConstructorInjectionPoint.java | 15 +- .../weld/injection/FieldInjectionPoint.java | 3 +- .../injection/FieldResourceInjection.java | 3 +- .../injection/ForwardingInjectionPoint.java | 10 +- .../injection/ForwardingInjectionTarget.java | 2 +- .../weld/injection/InjectionContextImpl.java | 9 +- .../weld/injection/InjectionPointFactory.java | 22 +- .../injection/InterceptionFactoryImpl.java | 14 +- .../weld/injection/MethodInjectionPoint.java | 21 +- .../injection/MethodInvocationStrategy.java | 42 +- .../ParameterInjectionPointImpl.java | 3 +- ...ClassConstructorInjectionPointWrapper.java | 8 +- .../injection/ResourceInjectionFactory.java | 5 +- .../injection/ResourceInjectionProcessor.java | 42 +- .../jboss/weld/injection/SecurityActions.java | 1 - .../injection/SetterResourceInjection.java | 3 +- .../injection/StaticMethodInjectionPoint.java | 15 +- .../weld/injection/ThreadLocalStack.java | 33 +- .../VirtualMethodInjectionPoint.java | 20 +- ...actForwardingInjectionPointAttributes.java | 3 +- ...ractInferringInjectionPointAttributes.java | 6 +- ...rwardingFieldInjectionPointAttributes.java | 3 +- .../ForwardingInjectionPointAttributes.java | 3 +- ...dingParameterInjectionPointAttributes.java | 6 +- ...nferringFieldInjectionPointAttributes.java | 15 +- ...ringParameterInjectionPointAttributes.java | 18 +- .../SpecialParameterInjectionPoint.java | 9 +- .../injection/attributes/package-info.java | 2 +- .../jboss/weld/injection/package-info.java | 2 +- ...AbstractDecoratorApplyingInstantiator.java | 15 +- .../producer/AbstractMemberProducer.java | 24 +- .../producer/BasicInjectionTarget.java | 34 +- .../producer/BeanInjectionTarget.java | 33 +- .../ConstructorInterceptionInstantiator.java | 12 +- .../producer/DecoratorInjectionTarget.java | 29 +- .../injection/producer/DefaultInjector.java | 5 +- .../producer/DefaultInstantiator.java | 3 +- .../DefaultLifecycleCallbackInvoker.java | 4 +- .../InjectionTargetInitializationContext.java | 3 +- .../weld/injection/producer/Injector.java | 5 +- .../weld/injection/producer/Instantiator.java | 3 +- .../InterceptionModelInitializer.java | 71 ++- .../InterceptorApplyingInstantiator.java | 6 +- .../NonProducibleInjectionTarget.java | 15 +- .../NoopLifecycleCallbackInvoker.java | 2 +- .../producer/ProducerFieldProducer.java | 15 +- .../producer/ProducerMethodProducer.java | 28 +- .../injection/producer/ResourceInjector.java | 3 +- ...SubclassDecoratorApplyingInstantiator.java | 11 +- .../SubclassedComponentInstantiator.java | 47 +- .../WeldInjectionTargetBuilderImpl.java | 11 +- .../weld/injection/producer/package-info.java | 2 +- .../builder/InterceptionModelBuilder.java | 11 +- .../builder/InterceptionModelImpl.java | 6 +- .../builder/InterceptorsApiAbstraction.java | 3 +- .../interceptor/builder/package-info.java | 2 +- .../proxy/AbstractInvocationContext.java | 25 +- .../proxy/AroundInvokeInvocationContext.java | 24 +- .../proxy/CustomInterceptorInvocation.java | 6 +- .../proxy/InterceptionContext.java | 50 +- .../proxy/InterceptorInvocation.java | 6 +- .../proxy/InterceptorMethodHandler.java | 24 +- ...TerminalAroundInvokeInvocationContext.java | 18 +- .../proxy/SimpleInvocationContext.java | 9 +- ...TerminalAroundInvokeInvocationContext.java | 12 +- .../proxy/WeldInvocationContextImpl.java | 29 +- .../weld/interceptor/proxy/package-info.java | 2 +- .../reader/AbstractInterceptorMetadata.java | 6 +- .../reader/InterceptorMetadataImpl.java | 3 +- .../reader/InterceptorMetadataReader.java | 6 +- .../reader/InterceptorMetadataUtils.java | 42 +- .../reader/PlainInterceptorFactory.java | 3 +- .../reader/SimpleInterceptorInvocation.java | 9 +- .../TargetClassInterceptorMetadata.java | 3 +- .../weld/interceptor/reader/package-info.java | 2 +- .../metadata/InterceptorClassMetadata.java | 1 + .../spi/metadata/InterceptorFactory.java | 1 + .../spi/metadata/InterceptorMetadata.java | 7 +- .../spi/metadata/package-info.java | 2 +- .../spi/model/InterceptionModel.java | 8 +- .../interceptor/spi/model/package-info.java | 2 +- .../util/InterceptionTypeRegistry.java | 4 +- .../interceptor/util/InterceptionUtils.java | 3 +- .../weld/interceptor/util/package-info.java | 2 +- .../TargetInstanceProxyMethodHandler.java | 1 - .../interceptor/util/proxy/package-info.java | 2 +- .../org/jboss/weld/literal/package-info.java | 2 +- .../org/jboss/weld/logging/BeanLogger.java | 6 +- .../jboss/weld/logging/BeanManagerLogger.java | 1 - .../jboss/weld/logging/BootstrapLogger.java | 2 +- .../jboss/weld/logging/InterceptorLogger.java | 14 +- .../weld/logging/LogMessageCallback.java | 6 +- .../jboss/weld/logging/MessageCallback.java | 3 +- .../jboss/weld/logging/MetadataLogger.java | 3 +- .../jboss/weld/logging/ReflectionLogger.java | 3 +- .../jboss/weld/logging/ValidatorLogger.java | 53 +- .../org/jboss/weld/logging/WeldLogger.java | 3 +- .../org/jboss/weld/logging/package-info.java | 2 +- .../weld/manager/AbstractProducerFactory.java | 3 +- .../jboss/weld/manager/BeanManagerImpl.java | 164 ++++-- .../manager/BeanManagerLookupService.java | 5 +- .../org/jboss/weld/manager/BeanManagers.java | 1 - .../weld/manager/FieldProducerFactory.java | 6 +- .../manager/InjectionTargetFactoryImpl.java | 21 +- .../weld/manager/MethodProducerFactory.java | 9 +- .../org/jboss/weld/manager/package-info.java | 2 +- .../org/jboss/weld/metadata/BeansXmlImpl.java | 3 +- .../org/jboss/weld/metadata/FileMetadata.java | 4 +- .../org/jboss/weld/metadata/FilterImpl.java | 8 +- .../jboss/weld/metadata/FilterPredicate.java | 20 +- .../org/jboss/weld/metadata/ScanningImpl.java | 4 +- .../org/jboss/weld/metadata/Selectors.java | 32 +- .../jboss/weld/metadata/WeldFilterImpl.java | 3 +- .../weld/metadata/cache/AnnotationModel.java | 4 +- .../cache/InterceptorBindingModel.java | 18 +- .../metadata/cache/MetaAnnotationStore.java | 13 +- .../weld/metadata/cache/QualifierModel.java | 15 +- .../weld/metadata/cache/StereotypeModel.java | 10 +- .../weld/metadata/cache/package-info.java | 2 +- .../org/jboss/weld/metadata/package-info.java | 2 +- .../org/jboss/weld/module/EjbSupport.java | 25 +- .../module/ExpressionLanguageSupport.java | 1 + .../weld/module/ObserverNotifierFactory.java | 3 +- .../org/jboss/weld/module/WeldModule.java | 34 +- .../org/jboss/weld/module/WeldModules.java | 9 +- .../org/jboss/weld/module/package-info.java | 2 +- .../java/org/jboss/weld/package-info.java | 2 +- .../jboss/weld/persistence/package-info.java | 2 +- .../AbstractTypeSafeBeanResolver.java | 27 +- .../weld/resolution/AssignabilityRules.java | 4 +- .../BeanTypeAssignabilityRules.java | 3 +- .../jboss/weld/resolution/CovariantTypes.java | 9 +- .../EventTypeAssignabilityRules.java | 6 +- .../InterceptorResolvableBuilder.java | 7 +- .../jboss/weld/resolution/InvariantTypes.java | 9 +- .../weld/resolution/QualifierInstance.java | 11 +- .../weld/resolution/ResolvableBuilder.java | 12 +- .../resolution/TypeSafeDecoratorResolver.java | 3 +- .../resolution/TypeSafeDisposerResolver.java | 7 +- .../TypeSafeInterceptorResolver.java | 6 +- .../resolution/TypeSafeObserverResolver.java | 12 +- .../weld/resolution/TypeSafeResolver.java | 6 +- .../jboss/weld/resolution/package-info.java | 2 +- .../resources/ClassLoaderResourceLoader.java | 1 - .../weld/resources/ClassTransformer.java | 21 +- .../resources/DefaultReflectionCache.java | 11 +- .../weld/resources/DefaultResourceLoader.java | 1 - .../weld/resources/ManagerObjectFactory.java | 9 +- .../weld/resources/MemberTransformer.java | 15 +- .../jboss/weld/resources/ReflectionCache.java | 1 + .../weld/resources/SharedObjectCache.java | 34 +- .../jboss/weld/resources/package-info.java | 2 +- .../ConstructorNewInstanceAction.java | 9 +- .../security/GetAccessibleCopyOfMember.java | 3 +- .../weld/security/GetConstructorAction.java | 3 +- .../GetDeclaredConstructorAction.java | 3 +- .../security/GetDeclaredMethodAction.java | 3 +- .../weld/security/MethodLookupAction.java | 6 +- .../org/jboss/weld/security/package-info.java | 2 +- .../serialization/BeanIdentifierIndex.java | 11 +- .../weld/serialization/ConstructorHolder.java | 3 +- .../serialization/ContextualStoreImpl.java | 11 +- .../serialization/InjectionPointHolder.java | 15 +- .../weld/serialization/package-info.java | 2 +- .../jboss/weld/util/AccessControllers.java | 3 +- .../org/jboss/weld/util/AnnotatedTypes.java | 47 +- .../java/org/jboss/weld/util/Annotations.java | 4 +- .../java/org/jboss/weld/util/BeanMethods.java | 87 ++- .../main/java/org/jboss/weld/util/Beans.java | 42 +- .../java/org/jboss/weld/util/Bindings.java | 3 +- .../java/org/jboss/weld/util/Decorators.java | 29 +- .../java/org/jboss/weld/util/Defaults.java | 4 +- .../jboss/weld/util/DeploymentStructures.java | 6 +- .../weld/util/ForwardingBeanManager.java | 3 +- .../weld/util/ForwardingCompletionStage.java | 24 +- .../jboss/weld/util/ForwardingContext.java | 2 +- .../weld/util/ForwardingExecutorService.java | 6 +- .../org/jboss/weld/util/InjectionPoints.java | 28 +- .../org/jboss/weld/util/InjectionTargets.java | 9 +- .../weld/util/InterceptorBindingSet.java | 12 +- .../org/jboss/weld/util/Interceptors.java | 44 +- .../org/jboss/weld/util/LazyValueHolder.java | 1 + .../java/org/jboss/weld/util/Observers.java | 30 +- .../java/org/jboss/weld/util/Permissions.java | 3 +- .../org/jboss/weld/util/Preconditions.java | 3 +- .../java/org/jboss/weld/util/Primitives.java | 3 +- .../java/org/jboss/weld/util/Proxies.java | 26 +- .../org/jboss/weld/util/SecurityActions.java | 3 +- .../org/jboss/weld/util/ServiceLoader.java | 7 +- .../java/org/jboss/weld/util/Services.java | 10 +- .../main/java/org/jboss/weld/util/Types.java | 8 +- .../util/annotated/AnnotatedTypeWrapper.java | 3 +- .../util/annotated/ForwardingAnnotated.java | 3 +- .../ForwardingAnnotatedConstructor.java | 3 +- .../annotated/ForwardingAnnotatedType.java | 3 +- .../weld/util/annotated/package-info.java | 2 +- .../util/bean/ForwardingBeanAttributes.java | 2 +- .../util/bean/IsolatedForwardingBean.java | 2 +- .../weld/util/bean/WrappedBeanHolder.java | 1 + .../jboss/weld/util/bean/package-info.java | 2 +- .../weld/util/bytecode/BytecodeUtils.java | 10 +- .../weld/util/bytecode/ConstructorUtils.java | 21 +- .../bytecode/StaticMethodInformation.java | 4 +- .../weld/util/bytecode/package-info.java | 2 +- .../jboss/weld/util/cache/ComputingCache.java | 4 +- .../ReentrantMapBackedComputingCache.java | 6 +- .../jboss/weld/util/cache/package-info.java | 2 +- .../util/collections/AbstractMultimap.java | 3 +- .../util/collections/ImmutableHashSet.java | 3 +- .../weld/util/collections/ImmutableList.java | 11 +- .../weld/util/collections/ImmutableMap.java | 6 +- .../weld/util/collections/ImmutableSet.java | 6 +- .../util/collections/ImmutableTinySet.java | 7 +- .../weld/util/collections/Iterables.java | 5 +- .../weld/util/collections/Iterators.java | 3 +- .../weld/util/collections/ListMultimap.java | 3 +- .../weld/util/collections/ListToSet.java | 1 + .../jboss/weld/util/collections/ListView.java | 5 +- .../jboss/weld/util/collections/Multimap.java | 15 +- .../weld/util/collections/Multimaps.java | 6 +- .../weld/util/collections/SetMultimap.java | 3 +- .../org/jboss/weld/util/collections/Sets.java | 3 +- .../util/collections/WeldCollections.java | 7 +- .../weld/util/collections/package-info.java | 2 +- .../org/jboss/weld/util/package-info.java | 2 +- .../jboss/weld/util/reflection/Formats.java | 70 ++- .../util/reflection/GenericArrayTypeImpl.java | 4 +- .../util/reflection/HierarchyDiscovery.java | 65 ++- .../reflection/ParameterizedTypeImpl.java | 7 +- .../weld/util/reflection/Reflections.java | 24 +- .../weld/util/reflection/TypeResolver.java | 3 +- .../weld/util/reflection/package-info.java | 2 +- .../org/jboss/weld/ws/WSApiAbstraction.java | 4 +- .../java/org/jboss/weld/ws/package-info.java | 2 +- .../org/jboss/weld/xml/BeansXmlParser.java | 13 +- .../jboss/weld/xml/BeansXmlStreamParser.java | 50 +- .../org/jboss/weld/xml/BeansXmlValidator.java | 9 +- .../java/org/jboss/weld/xml/XmlMetadata.java | 4 +- .../java/org/jboss/weld/xml/XmlSchema.java | 7 +- .../java/org/jboss/weld/xml/package-info.java | 2 +- .../enablement/EnablementListViewTest.java | 18 +- .../jboss/weld/tests/unit/VersionTest.java | 4 +- .../unit/comparator/CustomComparatorTest.java | 13 +- .../classes/raw/RawTypeDiscoveryTest.java | 1 + .../unit/metadata/BeansXmlMergeTest.java | 3 +- .../reflection/annotation/AnnotationTest.java | 10 +- .../unit/reflection/annotation/Quality.java | 13 +- .../reflection/annotation/Synchronous.java | 13 +- .../tests/unit/reflection/clazz/Antelope.java | 1 - .../tests/unit/reflection/clazz/Kangaroo.java | 1 - .../tests/unit/reflection/clazz/Order.java | 1 - .../tests/unit/reflection/clazz/Possum.java | 1 - .../tests/unit/reflection/clazz/Random.java | 13 +- .../unit/reflection/clazz/WeldClassTest.java | 56 +- .../nested/ClassWithNestedClasses.java | 4 +- .../util/BeanTypeAssignabilityTest.java | 238 ++++++-- ...legateInjectionPointAssignabilityTest.java | 83 ++- .../util/EventTypeAssignabilityTest.java | 143 +++-- .../unit/reflection/util/Weld1102Test.java | 58 +- .../unit/resolution/CovariantTypesTest.java | 379 ++++++++----- .../unit/resolution/InvariantTypesTest.java | 49 +- .../tests/unit/security/ReflectionTest.java | 508 +++++++++--------- .../tests/unit/security/SecurityTest.java | 4 +- .../tests/unit/security/SuperTestObject.java | 46 +- .../weld/tests/unit/security/TestObject.java | 94 ++-- .../tests/unit/selector/SelectorTest.java | 9 +- .../BeanIdentifierIndexTest.java | 3 +- .../weld/tests/unit/util/ProxiesTest.java | 41 +- .../AbstractImmutableListTest.java | 2 +- .../collections/AbstractImmutableMapTest.java | 3 +- .../collections/ImmutableArrayListTest.java | 2 +- .../util/collections/ImmutableListTest.java | 8 +- .../util/collections/ImmutableMapTest.java | 3 +- .../util/collections/ImmutableSetTest.java | 9 +- .../util/collections/ListMultimapTest.java | 3 +- .../util/collections/SetMultimapTest.java | 2 +- .../util/collections/SingletonListTest.java | 2 +- .../util/collections/WeldCollectionsTest.java | 3 +- .../unit/util/reflection/FormatsTest.java | 3 +- .../unit/util/reflection/ReflectionsTest.java | 6 +- .../tests/unit/util/reflection/Small.java | 2 +- .../interfaceClosure/AnotherBarInterface.java | 2 +- .../interfaceClosure/BaseInterface.java | 2 +- .../util/reflection/interfaceClosure/Foo.java | 2 +- .../interfaceClosure/FooInterface.java | 2 +- .../atinject/tck/AllDiscoveryBeansXml.java | 8 +- .../jboss/weld/atinject/tck/AtInjectTCK.java | 16 +- .../atinject/tck/AtInjectTCKExtension.java | 15 +- .../jboss/weld/tck/WeldMethodInterceptor.java | 3 +- ...ildFly8DeploymentExceptionTransformer.java | 6 +- .../wildfly8/WildFly8EEResourceManager.java | 6 +- .../lang/model/tck/LangModelExtension.java | 1 + .../weld/lang/model/tck/LangModelTckTest.java | 1 + ...tEJBRequestScopeActivationInterceptor.java | 14 +- .../module/ejb/DynamicInjectionPoint.java | 3 +- .../ejb/DynamicInjectionPointInjector.java | 10 +- .../jboss/weld/module/ejb/EjbSupportImpl.java | 28 +- .../module/ejb/EnterpriseBeanInstance.java | 4 +- .../ejb/EnterpriseBeanProxyMethodHandler.java | 28 +- .../module/ejb/EnterpriseProxyFactory.java | 3 +- ...opagatingEnterpriseTargetBeanInstance.java | 6 +- .../module/ejb/InternalEjbDescriptor.java | 2 +- .../SessionBeanAwareInjectionPointBean.java | 1 - .../weld/module/ejb/SessionBeanImpl.java | 42 +- .../ejb/SessionBeanInjectionTarget.java | 24 +- .../module/ejb/SessionBeanInterceptor.java | 3 +- .../ejb/SessionBeanProxyInstantiator.java | 6 +- .../jboss/weld/module/ejb/SessionBeans.java | 15 +- .../jboss/weld/module/ejb/WeldEjbModule.java | 6 +- .../weld/module/ejb/WeldEjbValidator.java | 6 +- .../ejb/context/EjbRequestContextImpl.java | 13 +- .../ejb/context/beanstore/package-info.java | 2 +- .../weld/module/ejb/context/package-info.java | 2 +- .../jsf/ConversationAwareViewHandler.java | 14 +- .../weld/module/jsf/FacesUrlTransformer.java | 5 +- .../ConversationPropagationFilter.java | 13 +- .../tests/unit/cid/CidParamMatchingTest.java | 15 +- .../module/jta/DeferredEventNotification.java | 5 +- .../org/jboss/weld/module/jta/Status.java | 7 +- .../jta/TransactionalObserverNotifier.java | 12 +- .../jboss/weld/module/jta/package-info.java | 2 +- .../module/web/HttpServletRequestBean.java | 2 +- .../weld/module/web/ServletContextBean.java | 4 +- .../jboss/weld/module/web/WeldWebModule.java | 22 +- .../http/AbstractSessionBeanStore.java | 14 +- .../beanstore/http/LazySessionBeanStore.java | 4 +- .../context/beanstore/http/package-info.java | 2 +- .../http/HttpConversationContextImpl.java | 5 +- .../context/http/HttpRequestContextImpl.java | 9 +- .../context/http/HttpSessionContextImpl.java | 12 +- .../http/HttpSessionDestructionContext.java | 2 +- .../http/LazyHttpConversationContextImpl.java | 12 +- .../module/web/context/http/package-info.java | 2 +- .../module/web/el/AbstractWeldELResolver.java | 1 - .../module/web/el/ELCreationalContext.java | 7 +- .../web/el/ELCreationalContextStack.java | 3 +- .../module/web/el/WeldExpressionFactory.java | 9 +- .../module/web/el/WeldMethodExpression.java | 4 +- .../module/web/el/WeldValueExpression.java | 4 +- .../weld/module/web/el/package-info.java | 2 +- .../module/web/logging/ServletLogger.java | 2 +- .../jboss/weld/module/web/package-info.java | 2 +- .../servlet/ConversationContextActivator.java | 21 +- .../web/servlet/ConversationFilter.java | 9 +- .../web/servlet/HttpContextLifecycle.java | 39 +- .../web/servlet/ServletContextService.java | 1 + .../web/servlet/WeldCrossContextFilter.java | 74 +-- .../web/servlet/WeldInitialListener.java | 10 +- .../web/servlet/WeldTerminalListener.java | 5 +- .../weld/module/web/servlet/package-info.java | 2 +- .../util/el/ForwardingExpressionFactory.java | 3 +- .../util/el/ForwardingValueExpression.java | 4 +- .../weld/module/web/util/el/package-info.java | 2 +- .../module/web/util/servlet/ServletUtils.java | 8 +- .../module/web/util/servlet/package-info.java | 2 +- .../unit/el/WeldExpressionFactoryTest.java | 1 + .../unit/el/WeldMethodExpressionTest.java | 17 +- pom.xml | 6 +- .../weld/tests/TestClassToHashMapper.java | 8 +- .../accessibility/EarAccessibilityTest.java | 15 +- .../tests/accessibility/War1Listener.java | 9 +- .../tests/accessibility/War2Listener.java | 9 +- .../accessibility/WarAccessibilityTest.java | 3 +- .../tests/alternatives/Alternatives2Test.java | 1 - .../tests/alternatives/TestAlternative.java | 7 +- .../AccessibleAlternatives2Test.java | 13 +- .../AccessibleAlternativesTest.java | 21 +- .../CustomPrioritizedAlternativeTest.java | 3 +- .../CustomBeanPriorityTest.java | 5 +- .../customBeanPriority/MyExtension.java | 16 +- .../ee/AlternativeEEComponentTest.java | 12 +- ...AlternativeHttpServletRequestProducer.java | 3 +- .../jboss/weld/tests/alternatives/ee/Foo.java | 1 - .../tests/alternatives/samePriority/Foo.java | 2 +- .../alternatives/samePriority/FooAlt1.java | 2 +- .../alternatives/samePriority/FooAlt2.java | 2 +- ...ectedAlternativesWithSamePriorityTest.java | 11 +- ...ledClassWithAlternativeStereotypeTest.java | 4 +- .../DisabledAlternativeNotValidatedTest.java | 4 +- .../EnabledAlternativeValidatedTest.java | 5 +- .../alternatives/weld930/Weld930Test.java | 2 +- .../jboss/weld/tests/annotatedType/Bean.java | 1 - .../jboss/weld/tests/annotatedType/Child.java | 1 - .../annotatedType/DeclaringTypeTest.java | 16 +- .../weld/tests/annotatedType/ExampleTest.java | 18 +- .../weld/tests/annotatedType/Parent.java | 1 - .../annotation/SyntheticAnnotationTest.java | 10 +- .../AnnotatedTypeDecoratorTest.java | 17 +- .../decoration/MockAnnotatedCallable.java | 11 +- .../decoration/MockAnnotatedConstructor.java | 3 +- .../decoration/MockAnnotatedField.java | 3 +- .../decoration/MockAnnotatedMethod.java | 3 +- .../decoration/MockAnnotatedType.java | 5 +- .../decoration/NotAnnotated.java | 1 - .../tests/annotatedType/interceptors/Box.java | 4 +- .../InterceptedAnnotatedTypeTest.java | 3 +- .../interceptors/SetupExtension.java | 5 +- .../observers/AnnotatedTypeObserversTest.java | 54 +- .../annotatedType/observers/CleanEvent.java | 3 +- .../tests/annotatedType/observers/Room.java | 26 +- .../tests/annotatedType/observers/RoomId.java | 90 ++-- .../observers/RoomsExtension.java | 187 +++---- .../superclass/ModifyExtension.java | 7 +- .../superclass/SuperclassModifiedTest.java | 10 +- .../superclass/SuperclassTest.java | 8 +- .../superclass/TestExtension.java | 4 +- .../annotatedType/weld1144/CdiExtension.java | 2 +- .../annotatedType/weld1144/CdiTest1.java | 4 +- .../annotatedType/weld1144/CdiTest2.java | 4 +- .../annotatedType/weld1144/Original.java | 12 +- .../annotatedType/weld1144/Weld1144Test.java | 2 +- .../tests/annotations/AnnotationTest.java | 6 +- .../org/jboss/weld/tests/annotations/Cow.java | 1 - .../org/jboss/weld/tests/annotations/Foo.java | 13 +- .../annotations/weld1131/MyAnnotation.java | 2 +- .../annotations/weld1131/Weld1131Test.java | 5 +- .../weld/tests/arrays/ArrayInjectionTest.java | 18 +- .../weld/tests/arrays/ArrayProducer.java | 6 +- .../java/org/jboss/weld/tests/arrays/Bar.java | 9 +- .../tests/arrays/test/AssignabilityTest.java | 63 +-- .../assignability/AssignabilityTest.java | 6 +- .../RecursiveGenericProducer.java | 7 +- .../RecursiveGenericsAssignabilityTest.java | 21 +- .../tests/assignability/variable/Foo.java | 1 - .../TypeVariableAssignabilityTest.java | 3 +- .../circular/DependentLooping.java | 13 +- .../DependentSelfInjectionProducerTest.java | 2 +- .../circular/DependentSelfInjectionTest.java | 2 +- .../Bootstrap2Test.java | 7 +- .../missingClassDependency/BootstrapTest.java | 7 +- .../managed/multiple/BootstrapTest.java | 13 +- .../managed/multiple/Whitefish.java | 13 +- .../beanDeployment/mixed/BootstrapTest.java | 13 +- .../beanDeployment/mixed/Synchronous.java | 13 +- .../weld/tests/beanDeployment/mixed/Tame.java | 13 +- .../tests/beanDeployment/mixed/Whitefish.java | 13 +- .../NoClassDefFoundErrorTest.java | 4 +- .../singleProducerMethod/BootstrapTest.java | 13 +- .../producers/singleProducerMethod/Tame.java | 13 +- .../singleProducerMethod/Tarantula.java | 1 - .../session/multiple/BootstrapTest.java | 13 +- .../session/multiple/Synchronous.java | 13 +- .../beanDeployment/session/multiple/Tame.java | 13 +- .../session/single/BootstrapTest.java | 13 +- .../beanDeployment/session/single/Tame.java | 13 +- .../tests/beanManager/BeanManagerTest.java | 2 +- .../beanManager/access/IncontainerTest.java | 4 +- .../CreateAnnotatedTypeWithIdTest.java | 13 +- .../annotation/ManagerAnnotationTest.java | 33 +- .../tests/beanManager/bean/BeanExtension.java | 2 +- .../beanManager/bean/SyntheticBeanTest.java | 6 +- .../weld/tests/beanManager/bean/Vehicle.java | 2 +- .../weld/tests/beanManager/bean/Zoo.java | 2 +- .../CreateBeanAttributesTest.java | 21 +- .../beanAttributes/TundraStereotype.java | 10 +- .../beanAttributes/WrappedAnnotatedType.java | 4 +- .../BeanContainerInjectionTest.java | 1 + .../bootstrap/CdiExtensionBean.java | 49 +- .../bootstrap/GetBeansExtension.java | 1 - .../bootstrap/GetBeansExtensionTest.java | 116 ++-- .../unavailable/methods/Transactional.java | 8 +- ...dsDuringApplicationInitializationTest.java | 4 +- .../unavailable/methods/WrongExtension.java | 5 +- .../extension/CharlieExtension.java | 1 - .../extension/GetExtensionTest.java | 11 +- .../extension/VerifyingExtension.java | 6 +- ...anualInterceptorInstanceRetrievalTest.java | 8 +- .../getReference/interceptor/MyBinding.java | 8 +- .../getReference/synthBean/MyExtension.java | 2 +- ...nthBeanCreationalContextHierarchyTest.java | 4 +- .../beanManager/injectionPoint/Book.java | 1 - .../CreateInjectionPointTest.java | 3 +- .../beanManager/injectionPoint/Library.java | 2 - .../InjectionTargetDecorationTest.java | 5 +- .../NonProducibleInjectionTargetTest.java | 3 +- .../ejb/InjectionTargetPostConstructTest.java | 6 +- .../mdb/AroundConstructBinding.java | 2 +- .../mdb/AroundInvokeBinding.java | 2 +- .../injectionTarget/mdb/MessageDriven.java | 2 +- .../mdb/MessageDrivenInjectionTargetTest.java | 9 +- .../beanManager/isStereotype/Document.java | 2 +- .../isStereotype/NamedStereoType.java | 2 +- .../beanManager/isStereotype/Secret.java | 2 +- .../beanManager/isStereotype/SuperSecret.java | 2 +- .../predestroy/BeanPreDestroyTest.java | 10 +- .../producer/SyntheticProducerTest.java | 41 +- .../serializability/ManagerTest.java | 2 +- .../id/delimiter/AllKnowingBean.java | 2 +- .../ProcessAnnotatedTypeResolutionTest.java | 3 +- .../type/VerifyingExtension.java | 11 +- ...TypeWithoutBeanDefiningAnnotationTest.java | 8 +- .../jboss/weld/tests/bridge/methods/Bar.java | 2 - .../methods/DisposerBridgeMethodTest.java | 3 +- .../jboss/weld/tests/bridge/methods/Foo.java | 2 - .../methods/ObserverBridgeMethodTest.java | 11 +- .../methods/ProducerBridgeMethodTest.java | 11 +- .../BuiltInBeanPassivationCapableTest.java | 10 +- .../ConstructorInjectionPointConsumer.java | 3 +- .../weld/tests/builtinBeans/Consumer.java | 1 - .../tests/builtinBeans/CowEventObserver.java | 3 +- .../jboss/weld/tests/builtinBeans/Dog.java | 3 +- .../FieldInjectionPointConsumer.java | 3 +- .../jboss/weld/tests/builtinBeans/Foo.java | 8 +- .../tests/builtinBeans/FooInterceptor.java | 2 +- .../MethodInjectionPointConsumer.java | 3 +- .../weld/tests/builtinBeans/Produced.java | 13 +- ...nPassivationCapableEventDecoratorTest.java | 6 +- ...ssivationCapableInstanceDecoratorTest.java | 6 +- .../weld/tests/builtinBeans/ee/Checker.java | 1 - .../builtinBeans/ee/EEResourceConsumer.java | 13 +- ...ceProducerFieldPassivationCapableTest.java | 8 +- .../weld/tests/builtinBeans/ee/Horse.java | 1 - .../weld/tests/builtinBeans/ee/Produced.java | 13 +- .../builtinBeans/ee/servlet/Servlet.java | 2 +- .../ee/servlet/ServletBeansTest.java | 8 +- .../context/ServletContextBeanTest.java | 18 +- .../servlet/session/EagerHttpSessionTest.java | 3 +- .../broken/InjectionPointOnDisposerTest.java | 5 +- .../metadata/BuiltinMetadataBeanTest.java | 3 +- .../tests/builtinBeans/metadata/Fruit.java | 12 +- .../builtinBeans/metadata/MilkProduct.java | 1 - .../builtinBeans/metadata/Probiotic.java | 12 +- ...atedBeanMetadataInjectionIntoBeanTest.java | 6 +- ...ecoratorMetadataInjectionIntoBeanTest.java | 5 +- ...ptedBeanMetadataInjectionIntoBeanTest.java | 6 +- ...erceptorMetadataInjectionIntoBeanTest.java | 6 +- ...nvalidBeanMetadataInjectionPoint1Test.java | 5 +- ...nvalidBeanMetadataInjectionPoint2Test.java | 5 +- ...nvalidBeanMetadataInjectionPoint3Test.java | 5 +- .../broken/decorator/MilkProduct.java | 1 - .../decorator/MilkProductDecorator1.java | 1 - .../decorator/MilkProductDecorator2.java | 2 - .../PropagationOfBeanMetadataTest.java | 7 +- .../broken/interceptor/FooServlet.java | 1 - .../interceptor/FooServletInterceptor.java | 2 +- ...nvalidBeanMetadataInjectionPoint1Test.java | 5 +- ...nvalidBeanMetadataInjectionPoint2Test.java | 5 +- ...nvalidBeanMetadataInjectionPoint3Test.java | 5 +- ...navailableInterceptedBeanMetadataTest.java | 4 +- .../decorators/interceptors/DecoratorTwo.java | 2 +- .../MultipleDecoratorsMetadataTest.java | 3 +- .../decorators/interceptors/SomeBinding.java | 4 +- ...adataPassivationCapableDependencyTest.java | 4 +- .../metadata/passivation/Fast.java | 8 +- .../VehicleDecoratorExtension.java | 3 +- .../org/jboss/weld/tests/category/Broken.java | 1 - .../weld/tests/category/Performance.java | 1 - .../ClassDefiningWithProducerTest.java | 4 +- .../classDefining/a/BeanWithProducer.java | 7 +- .../tests/classDefining/c/AppScopedBean.java | 4 +- .../classDefining/inherited/BeanProducer.java | 6 +- .../classDefining/inherited/ConsumerBean.java | 4 +- ...ProxyForHierarchicalInterfaceTypeTest.java | 10 +- .../interfaceOrdering/ProducerBean.java | 1 + ...erProxyDefinedInMostSpecificClassTest.java | 7 +- .../interfaceOrdering/b/Two.java | 1 + .../CombinedPropertiesFilesConfigTest.java | 35 +- ...onfigurationKeyHasDifferentValuesTest.java | 18 +- .../files/PropertiesFilesConfigTest.java | 27 +- .../ExternalConfigurationConfigTest.java | 3 +- .../SystemPropertiesConfigTest.java | 4 +- .../contexts/ApplicationScopedObject.java | 3 +- .../tests/contexts/ApplicationScopedTest.java | 4 +- .../org/jboss/weld/tests/contexts/Cat.java | 4 +- .../weld/tests/contexts/ContextTest.java | 27 +- .../org/jboss/weld/tests/contexts/House.java | 3 +- .../contexts/ParameterizedTypeScoped.java | 5 +- .../contexts/ParameterizedTypeScopedTest.java | 4 +- .../contexts/PassivatingContextTest.java | 24 +- .../weld/tests/contexts/StringHolder.java | 3 +- .../tests/contexts/WorkInInactiveContext.java | 1 - .../tests/contexts/activator/request/Foo.java | 1 - .../RequestScopedActiveInterceptorTest.java | 9 +- .../alterable/AlterableContextTest.java | 7 +- .../event/ApplicationScopeEventTest.java | 9 +- .../application/event/MultiWarTest.java | 14 +- .../cache/RequestScopedCacheLeakTest.java | 11 +- .../ClientConversationContextTest.java | 25 +- .../tests/contexts/conversation/Cloud.java | 3 +- .../ConversationTestPhaseListener.java | 17 +- .../conversation/ExceptionWritingFilter.java | 7 +- .../contexts/conversation/Hailstorm.java | 3 +- .../conversation/LockingIssueBean.java | 5 +- .../contexts/conversation/Snowstorm.java | 3 +- .../contexts/conversation/Thunderstorm.java | 3 +- .../tests/contexts/conversation/Tornado.java | 3 +- ...nversationSupportsServletForwardsTest.java | 90 ++-- .../ForwardingPhaseListener.java | 89 ++- .../EmptyCidConversationRestorationTest.java | 5 +- ...RunningConversationLifecycleEventTest.java | 14 +- .../contexts/conversation/event/Servlet.java | 6 +- ...ansientConversationLifecycleEventTest.java | 6 +- ...ultiwarConversationLifecycleEventTest.java | 10 +- ...ansientConversationLifecycleEventTest.java | 5 +- .../ClientConversationContextTest.java | 6 +- .../exceptionInPhaseListener/Cloud.java | 3 +- .../ConversationTestPhaseListener.java | 6 +- .../invalidation/ConversationBean.java | 5 +- .../invalidation/ConversationServlet.java | 2 - .../InvalidateConversationTest.java | 10 +- .../NonExistentConversationTest.java | 13 +- .../conversation/nonexistant/TestServlet.java | 1 + .../servlet/ServletConversationTest.java | 3 +- ...nContextDestroyedOnSessionTimeoutTest.java | 6 +- .../conversation/sessiontimeout/Foo.java | 10 +- .../timeout/ConversationTimeoutTest.java | 5 +- .../conversation/timeout/TimeoutFilter.java | 7 +- .../ConversationLockTimeoutTest.java | 19 +- .../timeout/concurrent/InspectServlet.java | 13 +- .../conversation/weld1178/Weld1178Test.java | 3 +- .../conversation/weld1262/Crossroad.java | 65 ++- .../contexts/conversation/weld1262/Guide.java | 34 +- .../conversation/weld1262/Weld1262Test.java | 96 ++-- .../conversation/weld1418/Servlet.java | 4 +- .../conversation/weld1418/Weld1418Test.java | 11 +- .../weld1559/LazyConversationContextTest.java | 8 +- .../creational/CreationalContextTest.java | 5 +- .../weld/tests/contexts/creational/Juicy.java | 2 +- .../dependent/DependentContextTest.java | 5 +- .../contexts/dependent/Transactional.java | 6 +- .../contexts/errorpage/ErrorPageTest.java | 13 +- .../weld/tests/contexts/errorpage/Storm.java | 3 +- .../passivating/custom/ClusterScoped.java | 10 +- ...eCalledWithSerializableParametersTest.java | 4 +- .../passivating/enterprise/Digital.java | 8 +- .../NonPassivationCapableSessionBeanTest.java | 7 +- .../passivating/enterprise/Telephone.java | 7 +- .../Cup_Broken.java | 2 +- .../NonPassivationCapableEjbTest.java | 5 +- .../contexts/passivating/injection/Bio.java | 8 +- .../contexts/passivating/injection/Farm.java | 2 +- ...atingInjectionIntoPassivatingBeanTest.java | 6 +- .../passivating/injection/Random.java | 12 +- .../passivating/injection/broken/Bio.java | 8 +- .../passivating/injection/broken/Farm.java | 2 +- .../injection/broken/FarmBroken1.java | 2 +- .../injection/broken/FarmBroken2.java | 2 +- ...onPassivatingConstructorParameterTest.java | 5 +- ...tingDecoratorConstructorParameterTest.java | 6 +- ...tingDecoratorInitializerParameterTest.java | 6 +- ...onPassivatingInitializerParameterTest.java | 6 +- ...ngInterceptorConstructorParameterTest.java | 7 +- ...ngInterceptorInitializerParameterTest.java | 7 +- .../NonPassivatingProducerParameterTest.java | 5 +- .../passivating/injection/broken/Random.java | 12 +- .../injection/broken/TestClasses.java | 3 +- .../serialization/PassivationTest.java | 5 +- .../serialization/interception/FooImpl.java | 2 +- .../interception/Intercepted.java | 6 +- ...NonPassivationCapableDependenciesTest.java | 9 +- .../passivating/validation/EnginePowered.java | 11 +- .../validation/EnginePoweredInterceptor.java | 4 +- .../passivating/validation/Ferry.java | 6 +- ...NonPassivationCapableDependenciesTest.java | 12 +- .../ContextPropagationService.java | 34 +- .../propagation/ContextPropagationTest.java | 9 +- ...stomRequestContextDuringAsyncCallTest.java | 7 +- .../request/event/RequestScopeEventTest.java | 4 +- .../filtering/HttpRequestFilteringTest.java | 11 +- ...gSingletonStartupWithDependenciesTest.java | 5 +- ...ScopeActiveDuringSingletonStartupTest.java | 4 +- ...opeActiveDuringSLSBInitializationTest.java | 4 +- .../weld/tests/contexts/request/rmi/My.java | 2 +- .../request/rmi/RmiRequestScopeTest.java | 6 +- ...ScopeActiveDuringSingletonStartupTest.java | 4 +- .../retrieval/WeldManagerGetContextsTest.java | 9 +- .../availability/RequestScopedBean.java | 12 +- .../availability/SessionAvailabilityTest.java | 13 +- .../availability/SessionScopedBean.java | 3 +- .../session/availability/TestServlet.java | 4 +- .../destroy/SessionContextDestroyTest.java | 4 +- .../tests/contexts/session/event/Servlet.java | 3 +- .../session/event/SessionScopeEventTest.java | 6 +- .../weld1155/SessionScopedProducerTest.java | 7 +- .../InvalidateSessionTest.java | 37 +- .../sessionInvalidation/SomeBean.java | 3 +- .../contexts/sessionInvalidation/Storm.java | 3 +- .../weld1159/ContextDeadlockTest.java | 20 +- .../tests/decorators/SimpleDecoratorTest.java | 7 +- .../DecoratorDefaultMethodTest.java | 31 +- .../DecoratorOverridingDefaultMethod.java | 12 +- .../SimpleAbstractDecoratorTest.java | 4 +- ...bstractMethodAndInitializerMethodTest.java | 4 +- ...stractDecoratorWithAbstractMethodTest.java | 7 +- ...AbstractDecoratorWithCallToItselfTest.java | 7 +- ...eAbstractDecoratorWithConstructorTest.java | 7 +- ...actDecoratorWithInitializerMethodTest.java | 8 +- ...tractDecoratorWithPrivateDelegateTest.java | 7 +- ...ecoratorWithInvalidAbstractMethodTest.java | 4 +- ...bstractMethodInDecoratorHierarchyTest.java | 3 +- .../DecoratorWithNoDecoratedTypes1Test.java | 11 +- .../DecoratorWithNoDecoratedTypes2Test.java | 11 +- .../DecoratorWithNoDecoratedTypes3Test.java | 11 +- .../weld/tests/decorators/broken/Foo.java | 2 +- .../NormalScopedDecoratorTest.java | 2 +- ...anPassivationCapabilityValidationTest.java | 11 +- .../decorators/custom/CustomDecorator.java | 6 +- .../custom/CustomDecorator2Test.java | 5 +- .../CustomDecoratorDeploymentObserver.java | 1 - .../CustomPrioritizedDecoratorTest.java | 6 +- .../custom/prioritized/DecoratedBar.java | 1 + .../decorators/defaultmethod/Decorated.java | 2 +- .../defaultmethod/DecoratedBean.java | 1 - ...ecoratedInteraceWithDefaultMethodTest.java | 8 +- ...oratingInterfaceWithDefaultMethodTest.java | 7 +- .../InterfaceWithDefaultMethod.java | 2 +- ...rfaceWithDefaultMethodAndGenericsTest.java | 5 +- .../jboss/weld/tests/decorators/ejb/Bar.java | 12 +- .../jboss/weld/tests/decorators/ejb/Baz.java | 12 +- .../decorators/ejb/EjbDecoratorTest.java | 5 +- .../jboss/weld/tests/decorators/ejb/Foo.java | 12 +- .../jboss/weld/tests/decorators/ejb/Qux.java | 12 +- .../ExceptionThrownByDecoratedBeanTest.java | 3 +- .../generic/PartialDecoratorTest.java | 1 - .../DecorateGenericObserverTest.java | 12 +- .../decorators/interceptor/Intercepted.java | 5 +- .../decorators/multidelegate/Account.java | 52 +- .../decorators/multidelegate/Account1.java | 66 +-- .../decorators/multidelegate/Account2.java | 66 +-- .../multidelegate/AccountDecorator.java | 75 +-- .../multidelegate/MultiDelegateTest.java | 110 ++-- .../global/DecoratorRegisteringExtension.java | 3 +- .../global/GlobalDecoratorOrderingTest.java | 16 +- .../tests/decorators/overloading/Alpha.java | 1 + .../tests/decorators/overloading/Bravo.java | 1 + .../overloading/BravoServiceDecorator.java | 1 - .../tests/decorators/overloading/Charlie.java | 1 + .../overloading/OverloadingDecoratorTest.java | 3 +- ...eNoArgsConstructorThrowsExceptionTest.java | 9 +- .../BeanWithoutNoArgsConstructor.java | 5 +- ...tNoArgsConstructorThrowsExceptionTest.java | 8 +- .../tests/decorators/resolution/Complex.java | 5 +- .../DecoratorResolutionTestsHelper.java | 6 +- .../tests/decorators/resolution/Simple.java | 5 +- .../decorators/stackoverflow/LogFactory.java | 3 +- .../stackoverflow/SecurePaymentService.java | 5 +- .../stackoverflow/SimplePaymentService.java | 5 +- .../stackoverflow/SimpleService.java | 5 +- .../stackoverflow/StackOverFlowTest.java | 4 +- .../weld/tests/decorators/weld1001/Large.java | 5 +- .../weld1001/LargeAmountAccount.java | 3 +- .../decorators/weld1110/MessageDecorator.java | 13 +- .../weld1110/MessageSenderImpl.java | 6 +- .../weld1110/MessageSenderTest.java | 7 +- .../weld1597/DecoratedInterface.java | 2 +- .../weld1597/NotDecoratedInterface.java | 4 +- .../decorators/weld1597/Weld1597Test.java | 5 +- .../tests/discovery/EmptyBeansXmlTest.java | 1 + .../DisposerMethodValidationTest.java | 5 +- .../DisposerMethodThrowsExceptionTest.java | 3 +- .../DisposedParameterPositionTest.java | 3 +- ...ParameterWithNoRequiredQualifiersTest.java | 4 +- .../disposer/resolution/GoalProducer.java | 3 +- .../DisposerMethodSpecializationTest.java | 7 +- .../DisposesMethodCalledOnceTest.java | 5 +- .../DisposalMethodWithStaticProducerTest.java | 8 +- .../disposer/withStaticProducer/Foo.java | 48 +- .../withStaticProducer/FooProducer.java | 96 ++-- .../withStaticProducer/StaticDisposer.java | 73 +-- .../withStaticProducer/StaticProducer.java | 73 +-- .../DependentSessionBeanNotSharedTest.java | 9 +- .../DuplicateEJBNamesDiscoveryTest.java | 7 +- .../ejb/duplicatenames/first/MyEjbImpl.java | 26 +- .../ejb/duplicatenames/second/MyEjbImpl.java | 26 +- .../SessionBeanInterceptorTest.java | 10 +- .../cdi/interceptor/CDIInterceptor.java | 2 +- .../CombinedInterceptorsOnEJBBeanTest.java | 4 +- ...nBeanInterceptorTrulySerializableTest.java | 4 +- .../org/jboss/weld/tests/ejb/mdb/EJBTest.java | 6 +- .../weld/tests/ejb/mdb/dummy/MilkMan.java | 1 - .../EnterpriseBeanPrivateMethodProxyTest.java | 14 +- .../tests/ejb/proxy/privateMethods/Foo.java | 6 +- .../ejb/proxy/privateMethods/TestedBean.java | 2 - .../ejb/singleton/SingletonStartupTest.java | 3 +- ...lSessionBeanRecreatedAfterDestroyTest.java | 4 +- .../NoInterfaceNonPublicMethodTest.java | 5 +- .../noInterfaceNonPublic/ProblematicBean.java | 5 +- .../noInterfaceNonPublic/SomeOtherBean.java | 5 +- .../weld/tests/el/resolver/BeerProducer.java | 10 +- .../weld/tests/el/weld1280/Weld1280Test.java | 3 +- .../el/weld1280/WeldTestPhaseListener.java | 4 +- .../tests/enterprise/AbstractDAOImpl.java | 1 - .../org/jboss/weld/tests/enterprise/DAO.java | 13 +- .../jboss/weld/tests/enterprise/DogBean.java | 1 - .../EnterpriseBeanDefinitionTest.java | 10 +- .../tests/enterprise/EnterpriseBeanTest.java | 24 +- .../jboss/weld/tests/enterprise/Fedora.java | 1 - .../weld/tests/enterprise/HelloAction.java | 5 +- .../lifecycle/AlarmedChickenHutch.java | 3 +- .../EnterpriseBeanLifecycleRemoteTest.java | 12 +- .../EnterpriseBeanLifecycleTest.java | 10 +- .../enterprise/lifecycle/OrderProcessor.java | 1 - .../enterprise/lifecycle/RemoteClient.java | 17 +- .../EnterpriseBeanLifecycleTest.java | 4 +- .../proxyability/MyStatelessBean.java | 3 +- .../enterprise/proxyability/SimpleBean.java | 3 +- .../MultiwarProjectNameValidation2Test.java | 11 +- .../MultiwarProjectNameValidationTest.java | 5 +- .../enterprise/weld1234/Weld1234Test.java | 4 +- .../weld/tests/event/EventQualifierTest.java | 4 +- .../weld/tests/event/NormalScopedBean.java | 3 +- .../weld/tests/event/SimpleEventTest.java | 12 +- .../org/jboss/weld/tests/event/Updated.java | 13 +- .../weld/tests/event/async/FireAsyncTest.java | 5 +- .../async/complex/ComplexAsyncEventTest.java | 3 +- .../event/async/complex/PiApproximation.java | 1 - ...questContextActiveInAsyncObserverTest.java | 7 +- .../SecurityContextPropagationTest.java | 3 +- ...yncEventNotificationPreservesTCCLTest.java | 16 +- .../executor/FireAsyncWithExecutorTest.java | 3 +- .../ExtensionWithAsyncObserverTest.java | 6 +- .../ExtensionWithBrokenAsyncObserverTest.java | 3 +- .../stage/FireAsyncCompletionStageTest.java | 3 +- .../container/lifecycle/ObservingBean.java | 6 +- .../lifecycle/StartupShutdownEventTest.java | 4 +- ...nerLifecycleEventNotFiredIntoBeanTest.java | 4 +- .../jboss/weld/tests/event/lifecycle/Foo.java | 3 +- ...fecycleEventDeliveryNotConcurrentTest.java | 9 +- .../ordering/LifecycleEventOrderingTest.java | 5 +- .../lifecycle/ordering/MassiveJugCoffee.java | 2 +- .../lifecycle/ordering/ProductManagement.java | 13 +- ...cleEventInvocationOutsideObserverTest.java | 23 +- .../lifecycle/phase/SimpleAnnotation.java | 3 +- .../ConditionalObserverCustomContextTest.java | 11 +- .../observer/conditional/CustomContext.java | 2 +- .../superclass/AbstractTestObserver.java | 38 +- .../event/observer/superclass/Disabled.java | 23 +- .../superclass/DisabledTestObserver.java | 30 +- .../event/observer/superclass/ReEnabled.java | 23 +- .../superclass/ReEnabledTestObserver.java | 28 +- .../superclass/SuperclassObservers1Test.java | 15 +- .../superclass/SuperclassObservers2Test.java | 13 +- .../superclass/SuperclassObserversTest.java | 13 +- .../observer/superclass/TestObserver.java | 16 +- .../event/observer/transactional/Actions.java | 4 +- .../event/observer/transactional/Agent.java | 1 + .../observer/transactional/DogAgent.java | 8 +- .../event/observer/transactional/Gnarly.java | 3 +- .../observer/transactional/Pomeranian.java | 2 +- .../event/observer/transactional/Tame.java | 13 +- .../TransactionalObserverRollbackTest.java | 7 +- .../validation/FiringArrayEventTest.java | 5 +- ...ethodParameterInjectionValidationTest.java | 10 +- .../observer/validation/SimpleObserver.java | 3 +- .../StringListArrayObserverBean.java | 6 +- .../validation/StringListObserverBean.java | 3 +- .../observer/validation/enterprise/Egg.java | 3 +- .../validation/enterprise/Farmer.java | 10 +- .../validation/enterprise/FarmerLocal.java | 9 +- ...dNotInBusinessInterfaceValidationTest.java | 7 +- .../validation/enterprise/LazyFarmer.java | 3 +- .../enterprise/LazyFarmerLocal.java | 3 +- .../observer/vetoreplace/DummyExtension.java | 2 - ...ExperimentalProcessObserverMethodTest.java | 14 +- .../event/observer/weld2338/Experimental.java | 2 +- .../tests/event/observer/weld2338/Foo.java | 4 +- .../event/observer/weld2338/Observer.java | 4 +- .../weld2338/ObserverInExtensionTest.java | 5 +- .../event/observer/weld2338/Payload.java | 2 +- .../event/ordering/EventOrderingTest.java | 3 +- .../event/parameterized/IntegerObserver.java | 4 +- .../parameterized/ParameterizedEventTest.java | 2 - .../event/parameterized/StringObserver.java | 4 +- .../tests/event/subtype/EventSelectTest.java | 3 +- .../weld/tests/event/tx/AbstractHtmlUnit.java | 6 +- .../org/jboss/weld/tests/event/tx/Foo.java | 3 +- .../weld/tests/event/tx/TxEventTest.java | 15 +- .../jboss/weld/tests/event/tx/Updated.java | 13 +- .../event/weld1361/FiringNullEventTest.java | 7 +- .../event/weld1361/RawEventTypeTest.java | 3 +- .../org/jboss/weld/tests/examples/Random.java | 13 +- .../weld/tests/examples/SentenceParser.java | 4 +- .../exceptions/ExceptionHandlingTest.java | 9 +- .../jboss/weld/tests/exceptions/Large.java | 13 +- .../tests/extensions/EngineeringWorks.java | 1 - .../extensions/EnterpriseExtensionTest.java | 18 +- .../tests/extensions/ExtensionObserver.java | 4 +- .../weld/tests/extensions/ExtensionTest.java | 40 +- .../weld/tests/extensions/OtherObserver.java | 4 +- .../tests/extensions/RailwayFurniture.java | 7 +- .../jboss/weld/tests/extensions/Relief.java | 7 +- .../tests/extensions/SafetyInspected.java | 5 +- .../tests/extensions/SimpleExtension.java | 1 - .../jboss/weld/tests/extensions/Special.java | 13 +- .../tests/extensions/TrainlineExtension.java | 1 - .../tests/extensions/WoodlandExtension.java | 3 +- .../metadata/AlternativeMetadataTest.java | 3 +- .../alternative/metadata/DeltaInterface.java | 1 - .../metadata/FoxtrotInterface.java | 1 - .../annotatedType/AnnotatedTypeExtension.java | 55 +- .../AnnotatedTypeExtensionTest.java | 39 +- .../EcoFriendlyWashingMachine.java | 18 +- .../annotatedType/FastWashingMachine.java | 13 +- .../extensions/annotatedType/Marker.java | 8 +- .../extensions/annotatedType/Original.java | 13 +- .../extensions/annotatedType/Special.java | 13 +- .../extensions/annotatedType/TumbleDryer.java | 2 - .../ejb/AnnotatedTypeEjbExtension.java | 13 +- .../ejb/AnnotatedTypeSessionBeanTest.java | 4 +- .../annotatedType/ejb/BigLathe.java | 3 +- .../annotatedType/ejb/ConveyorShaft.java | 3 +- .../annotatedType/ejb/SmallLathe.java | 3 +- .../annotatedType/withAnnotations/Group.java | 5 +- .../withAnnotations/UselessStereotype.java | 2 +- .../withAnnotations/VerifyingExtension.java | 9 +- .../withAnnotations/WithAnnotationsTest.java | 11 +- .../extensions/custombeans/AnotherRandom.java | 2 +- .../BeanConfiguratorFailureTest.java | 4 +- .../custombeans/BeanConfiguratorTest.java | 9 +- .../BeanConfiguratorWithNoCallbackTest.java | 13 +- .../custombeans/BrokenExtension.java | 3 +- .../custombeans/BuilderExtension.java | 6 +- .../extensions/custombeans/Configuration.java | 1 - .../IncorrectCustomBeanExtension.java | 4 +- .../tests/extensions/custombeans/Juicy.java | 2 +- .../tests/extensions/custombeans/Random.java | 2 +- ...oritizedBeanFiresProcessBeanEventTest.java | 9 +- .../custombeans/interceptor/Foo.java | 2 +- .../interceptor/InterceptorBuilderTest.java | 6 +- .../CustomBeanWithAbstractBeanTypeTest.java | 3 +- .../ExtensionInMultipleWarsTest.java | 12 +- ...ionIsPassivationCapableDependencyTest.java | 10 +- ...onPointWithTypesAndQualifiersOnlyTest.java | 5 +- .../extensions/interceptors/FullMarathon.java | 2 +- .../extensions/interceptors/Incremented.java | 2 +- .../interceptors/InterceptorExtension.java | 14 +- .../interceptors/LifecycleInterceptor.java | 2 - .../annotated/QuickExtension.java | 6 +- .../interceptors/annotated/Snail.java | 1 - .../SpiAddedInterceptorBindingTest.java | 3 +- .../invalidBeanTypes/ComplexBeanTypeTest.java | 9 +- .../invalidBeanTypes/CustomBeanType.java | 4 +- ...meterizedBeanTypeWithTypeVariableTest.java | 12 +- .../TypeVariableArrayBeanTypeTest.java | 7 +- .../TypeVariableBeanTypeTest.java | 7 +- ...ableMultiDimensionalArrayBeanTypeTest.java | 10 +- .../WildcardArrayBeanTypeTest.java | 7 +- .../WildcardBeanTypeTest.java | 7 +- ...cardMultiDimensionalArrayBeanTypeTest.java | 10 +- .../lifecycle/BeforeShutdownExtTest.java | 6 +- .../atd/AfterTypeDiscoveryObserver.java | 7 +- .../lifecycle/atd/AfterTypeDiscoveryTest.java | 3 +- .../lifecycle/atd/AlphaDecorator.java | 2 - .../lifecycle/atd/BravoDecorator.java | 2 - .../lifecycle/atd/CharlieDecorator.java | 2 - .../lifecycle/atd/EchoAlternative.java | 2 +- .../AfterTypeDiscoveryObserver.java | 8 +- .../MinValuePriorityAlternative.java | 2 +- .../MinValuePriorityTest.java | 4 +- .../minvaluepriority/NormalAlternative.java | 2 +- .../atd/prioritized/AbstractInterceptor.java | 1 + .../LegacyPrioritizedInterceptor.java | 1 - .../prioritized/PrioritizedInterceptor.java | 4 +- ...ionProvidedBeanDefiningAnnotationTest.java | 10 +- .../annotated/ProcessBeanTest.java | 3 +- ...dPassivationCapableBeanWithNullIdTest.java | 4 +- .../processBean/passivationCapable/Foo.java | 1 - .../processBeanAttributes/AlphaQualifier.java | 12 +- .../VerifyValuesTest.java | 3 +- .../broken/InvalidQualifierTest.java | 7 +- .../broken/InvalidScopeTest.java | 7 +- .../broken/InvalidStereotypeTest.java | 7 +- .../broken/InvalidTypesTest.java | 7 +- .../broken/passivation/Laptop.java | 4 +- ...ityErrorCausedByExtensionDetectedTest.java | 8 +- ...ncyErrorCausedByExtensionDetectedTest.java | 11 +- .../modify/ModifyingExtension.java | 3 +- .../modify/SetBeanAttributesTest.java | 3 +- .../notfired/MyExtension.java | 3 +- .../ProcessBeanAttributesNotFiredTest.java | 9 +- .../specialization/SpecializationTest.java | 6 +- .../specialization/VetoTest.java | 11 +- .../broken/TypeConflictDetectionTest.java | 5 +- .../specialization/broken/TypeExtension.java | 11 +- .../processBeanAttributes/veto/Field.java | 4 +- .../processBeanAttributes/veto/VetoTest.java | 3 +- .../lifecycle/processInjectionPoint/Bar.java | 12 +- .../lifecycle/processInjectionPoint/Foo.java | 12 +- .../ProcessInjectionPointFiredTest.java | 3 +- .../modify/InjectionPointOverridingTest.java | 3 +- .../processInjectionPoint/modify/Lazy.java | 12 +- .../subclass/FooBinding.java | 8 +- ...SubclassConstructorInjectionPointTest.java | 3 +- .../GetDisposedParameterTest.java | 3 +- .../lifecycle/processProducerField/Zero.java | 12 +- .../AnnotatedTypeWrapper.java | 2 +- .../AppleExtension.java | 2 +- .../RegisteringExtension1.java | 6 +- .../RegisteringExtension2.java | 4 +- .../weld1884/BeanWithAnonymousClasses.java | 4 +- .../EventsNotFiredForAnonymousClassTest.java | 2 +- .../ExtensionFieldMissingDependencyTest.java | 5 +- .../dependencies/InvalidExtension.java | 1 - .../extensions/multipleBeans/Author.java | 5 +- .../extensions/multipleBeans/Consumer.java | 5 +- .../multipleBeans/FormattedBlog.java | 5 +- .../multipleBeans/MultipleBeansExtension.java | 11 +- .../multipleBeans/MultipleBeansTest.java | 4 +- .../extensions/qualifiers/QuickExtension.java | 4 +- .../qualifiers/SpiAddedQualifierTest.java | 12 +- .../qualifiers/annotated/QuickExtension.java | 6 +- .../annotated/SpiAddedQualifierTest.java | 3 +- .../sessionbean/SessionBeanExtensionTest.java | 10 +- .../StaticNonLifecycleEventObserverTest.java | 1 - .../supertypes/beans/AnnotatedTypeImpl.java | 7 +- .../supertypes/beans/CDIExtension.java | 7 +- .../extensions/supertypes/beans/Foo.java | 13 +- .../supertypes/beans/SuperTypeTest.java | 8 +- .../validation/AbstractTestClass.java | 6 +- .../jboss/weld/tests/generic/TestBean.java | 1 - .../generic/MemberLevelInheritanceTest.java | 57 +- .../inheritance/weld824/SuperclassTest.java | 13 +- .../weld824/veto/SuperclassVetoTest.java | 14 +- .../weld/tests/injectionPoint/CowShed.java | 2 +- .../tests/injectionPoint/DoubleConsumer.java | 3 +- .../tests/injectionPoint/DoubleGenerator.java | 5 +- .../tests/injectionPoint/ExtraSpecial.java | 13 +- .../jboss/weld/tests/injectionPoint/Farm.java | 3 +- .../injectionPoint/InjectionPointTest.java | 39 +- .../tests/injectionPoint/IntConsumer.java | 3 +- .../tests/injectionPoint/IntGenerator.java | 5 +- .../weld/tests/injectionPoint/PigSty.java | 1 - .../weld/tests/injectionPoint/Special.java | 13 +- .../tests/injectionPoint/TimerManager.java | 5 +- .../tests/injectionPoint/custom/BarBean.java | 3 +- .../CustomBeanInjectionPointMetadataTest.java | 3 +- .../tests/injectionPoint/enterprise/Bar.java | 9 +- .../tests/injectionPoint/enterprise/Baz.java | 8 +- .../NamedParameterInjectionPointTest.java | 3 +- .../observer/EventInjectionPointTest.java | 3 +- .../tests/injectionPoint/resource/Alpha.java | 8 +- .../tests/injectionPoint/resource/Bravo.java | 4 +- .../injectionPoint/resource/Charlie.java | 2 +- .../resource/ResourceInjectionTest.java | 4 +- .../persistence/PersistenceInjectionTest.java | 8 +- .../tests/injectionPoint/weld1177/Bar.java | 1 - .../injectionPoint/weld1823/CDIBean.java | 4 +- .../injectionPoint/weld1823/Weld1823Test.java | 3 +- .../weld1950/TestDependentBeanProducer.java | 3 +- .../weld1950/Weld1950InjectionPointTest.java | 3 +- .../injectionTarget/InjectionTargetTest.java | 18 +- .../dispose/DisposingExtension.java | 90 ++-- .../dispose/InjectionTargetDisposeTest.java | 14 +- .../tests/injectionTarget/dispose/Widget.java | 5 +- .../DestroyingDependentInstanceTest.java | 4 +- .../instance/destroy/dependent/Intercept.java | 2 +- .../destroy/dependent/SLSessionBean.java | 2 +- .../DestroyingNormalScopedInstanceTest.java | 7 +- .../destroy/normal/SFSessionBean.java | 5 +- .../weld/tests/instance/enhanced/Alpha.java | 2 +- .../weld/tests/instance/enhanced/Client.java | 4 +- .../instance/enhanced/FirstProcessor.java | 2 +- .../instance/enhanced/InstanceHandleTest.java | 7 +- .../instance/enhanced/WeldInstanceTest.java | 1 - .../dependent/InstanceIteratorTest.java | 3 +- .../multideployment/CrossDeploymentTest.java | 5 +- .../jboss/weld/tests/interceptors/Ball.java | 1 - .../weld/tests/interceptors/BallImpl.java | 1 - .../jboss/weld/tests/interceptors/Shot.java | 7 +- ...eptedGenericBeanFromAbstractClassTest.java | 5 +- .../abstractClass/proxy/InterruptWork.java | 2 +- .../abstractClass/proxy/Vehicle.java | 2 +- .../proxy/VeryImportantPhoneCall.java | 2 +- .../ApplicationExceptionTest.java | 2 +- .../applicationException/FooBinding.java | 5 +- .../aroundConstruct/basic/AlphaBinding.java | 2 +- .../basic/AroundConstructTest.java | 3 +- .../BeanOverridingTypeLevelBinding.java | 3 +- ...thConstructorLevelAndTypeLevelBinding.java | 3 +- .../extended/BeanWithTypeLevelBinding.java | 3 +- .../extended/ConstructorInterceptionTest.java | 7 +- ...essionBeanConstructorInterceptionTest.java | 7 +- .../integration/AlphaInterceptor.java | 43 +- ...oundConstructContainerIntegrationTest.java | 7 +- .../integration/BravoInterceptor.java | 1 - .../integration/CharlieInterceptor.java | 4 +- .../aroundConstruct/lifecycle/Alpha.java | 4 +- .../lifecycle/AlphaBinding.java | 2 +- ...oundConstructInterceptorLifecycleTest.java | 3 +- .../binding/array/ArrayBindingTest.java | 5 +- .../binding/inheritance/AnotherMexican.java | 10 +- .../binding/inheritance/Binding.java | 11 +- .../InheritedInterceptorBindingsTest.java | 7 +- .../binding/inheritance/Interceptors.java | 3 +- .../binding/inheritance/broken/Binding.java | 11 +- .../ConflictingInterceptorBindingTest.java | 6 +- .../binding/overriding/Aging.java | 16 +- .../binding/overriding/Negating.java | 8 +- .../interceptors/binding/overriding/Pony.java | 1 + .../InterceptorBindingTransitivityTest.java | 24 +- .../binding/transitivity/Secure.java | 2 +- .../transitivity/UltraSynchronized.java | 2 +- .../binding/validation/BarBinding.java | 2 +- .../binding/validation/FooBinding.java | 2 +- .../InterceptorBindingTargetCheckTest.java | 3 +- .../common/SomeInterceptorBinding.java | 8 +- .../ejb/EJBBridgeMethodTest.java | 1 - .../bridgemethods/hierarchy/Child.java | 1 + .../bridgemethods/hierarchy/Fast.java | 2 +- .../bridgemethods/hierarchy/Juicy.java | 2 +- .../bridgemethods/hierarchy/Parent.java | 1 + .../bridgemethods/hierarchy/SpecialChild.java | 1 + .../managed/ManagedBeanBridgeMethodTest.java | 7 +- .../managed/ManagedSpecialServiceImpl.java | 2 +- ...chedInterceptionDecorationContextTest.java | 7 +- .../interceptors/cache/FooInterceptor.java | 2 +- .../circularInvocation/AllPurpose.java | 5 +- .../AllPurposeInterceptor.java | 7 +- .../circularInvocation/Failing.java | 13 +- .../circularInvocation/SomeBeanDecorator.java | 5 +- .../circularInvocation/Succeeding.java | 13 +- .../circularInvocation/ejb/Accountant.java | 2 +- .../ejb/AccountantInterceptor.java | 2 +- .../circularInvocation/ejb/Bar.java | 2 +- .../ejb/CircularInvocationClassTest.java | 6 +- .../InterceptorConflictingEnablementTest.java | 3 +- .../bindings/AroundConstructInterceptor.java | 4 +- .../bindings/AroundInvokeInterceptor.java | 5 +- .../context/bindings/BarBinding.java | 2 +- .../context/bindings/FooBinding.java | 2 +- ...ocationContextInterceptorBindingsTest.java | 4 +- .../bindings/PostConstructInterceptor.java | 4 +- .../bindings/PreDestroyInterceptor.java | 5 +- .../interceptors/delegation/Intercepted.java | 2 +- ...nvocationContextProceedDelegationTest.java | 5 +- .../ejb/EnterpriseBeanInterceptionTest.java | 48 +- .../weld/tests/interceptors/ejb/Pass.java | 7 +- .../weld/tests/interceptors/ejb/Shot.java | 7 +- .../tests/interceptors/ejb/TimeBound.java | 7 +- .../tests/interceptors/ejb3model/Ball.java | 2 +- .../ejb3model/Ejb3InterceptionModelTest.java | 12 +- .../interceptors/ejb3model/TimeBound.java | 7 +- .../interceptors/exceptions/FooBinding.java | 5 +- .../ExcludeClassInterceptorsTest.java | 3 +- .../extension/AbstractInterceptor.java | 12 +- .../extension/CustomInterceptor.java | 2 +- .../CustomInterceptorInvocationTest.java | 8 +- .../CustomInterceptorRegistrationTest.java | 10 +- .../CustomPrioritizedInterceptor.java | 6 +- .../extension/FooInterceptor.java | 4 +- .../extension/FooInterceptorBinding.java | 3 +- .../InterceptedBeanWithFinalEqualsTest.java | 91 ++-- .../interceptors/finalEquals/Quoted.java | 74 +-- .../interceptors/finalEquals/Quoter.java | 71 ++- .../finalEquals/QuotingInterceptor.java | 67 ++- .../InterceptedBeanWithFinalMethodTest.java | 10 +- .../interceptors/finalMethod/TopSecret.java | 7 +- .../generic/IntegerProcessor.java | 2 +- .../generic/SimpleWeldClassTest.java | 27 +- .../generic/overriden/AbstractService.java | 2 +- .../overriden/ActualInterceptedService.java | 2 +- .../GenericClassOverridenMethodTest.java | 4 +- .../generic/overriden/SuperFoo.java | 2 +- .../generic/overriden/TestBinding.java | 4 +- .../global/accessibility/FooBinding.java | 9 +- .../GlobalInterceptorAccessibilityTest.java | 8 +- .../InterceptorsWithHierarchyTest.java | 4 +- .../tests/interceptors/hierarchical/Play.java | 7 +- .../hierarchical/SimpleWeldClassTest.java | 27 +- .../packagePrivate/ActualImpl.java | 2 +- .../packagePrivate/TestBinding.java | 4 +- .../initialization/block/Dummy.java | 2 +- .../block/DummyInterceptor.java | 2 +- .../block/InicializationBlockTest.java | 5 +- .../block/InitializationBlock.java | 4 +- .../ejb/EjbInterceptorInjectionTest.java | 3 +- .../injectionWithExclusions/SimpleImpl.java | 5 +- .../Simple2Impl.java | 4 +- .../SimpleImpl.java | 5 +- .../Secured.java | 5 +- .../Counted.java | 5 +- .../Secured.java | 5 +- .../Counted.java | 5 +- .../Secured.java | 5 +- .../invalidContract/Intercept.java | 5 +- .../NoArgInterceptorInvalidContractTest.java | 4 +- ...ceptionInterceptorInvalidContractTest.java | 8 +- .../VoidInterceptorInvalidContractTest.java | 4 +- .../lhotse/SplitInterceptorsTest.java | 10 +- .../tests/interceptors/lhotse/fst/Tx.java | 10 +- .../lhotse/fst/TxInterceptor.java | 3 +- .../LifecycleInterceptorOrderingTest.java | 5 +- .../no/binding/FooInterceptor.java | 2 +- .../binding/InterceptorWithNoBindingTest.java | 14 +- .../NonDependentInterceptorTest.java | 2 +- .../Defender.java | 3 +- ...erializableFieldOnPassivatingBeanTest.java | 6 +- .../Pass.java | 7 +- .../nonSerializableInterceptor/Defender.java | 1 - ...atingInterceptorOnPassivatingBeanTest.java | 5 +- .../nonSerializableInterceptor/Pass.java | 7 +- .../BeanWithPrivateFinalMethodTest.java | 7 +- .../privateFinalMethods/Watches.java | 11 +- .../tests/interceptors/producer/Hello.java | 2 +- .../producer/InterceptionFactoryTest.java | 2 +- .../producer/InterfaceWithAnnotationImpl.java | 1 - .../tests/interceptors/producer/Producer.java | 79 +-- ...yableInterfaceWithClassAnnotationImpl.java | 2 +- .../InterceptorResourceInjectionTest.java | 6 +- .../tests/interceptors/retry/Retriable.java | 5 +- .../tests/interceptors/retry/Secured.java | 5 +- .../interceptors/retry/Transactional.java | 5 +- .../interceptors/retrySimple/Retriable.java | 5 +- .../retrySimple/Transactional.java | 5 +- .../weld/tests/interceptors/self/Bean.java | 8 +- .../interceptors/self/BeanDecorator.java | 7 +- .../tests/interceptors/self/ISecondBean.java | 3 +- .../weld/tests/interceptors/self/Secured.java | 5 +- .../selfInvocation/MyBinding.java | 5 +- .../selfInvocation/MyInterceptor.java | 1 + .../selfInvocation/MyOtherBinding.java | 5 +- .../selfInvocation/MyOtherInterceptor.java | 2 +- .../SelfInvocationInterceptionTest.java | 6 +- .../signature/AbstractSignatureTestBase.java | 6 +- ...ctInterceptorWithObjectReturnTypeTest.java | 4 +- ...ructInterceptorWithVoidReturnTypeTest.java | 4 +- ...erceptorWithInvalidParameterCountTest.java | 6 +- ...terceptorWithInvalidParameterTypeTest.java | 6 +- ...eInterceptorWithInvalidReturnTypeTest.java | 6 +- ...vokeInterceptorWithValidSignatureTest.java | 3 +- .../interceptors/signature/Intercept.java | 2 +- .../interceptors/signature/Lifecycle.java | 6 +- .../signature/LifecycleInterceptedBean.java | 2 +- .../signature/MethodInterceptedBean.java | 2 +- ...erceptorWithInvalidParameterCountTest.java | 6 +- ...terceptorWithInvalidParameterTypeTest.java | 6 +- ...tInterceptorWithInvalidReturnTypeTest.java | 8 +- ...ctInterceptorWithObjectReturnTypeTest.java | 4 +- ...ructInterceptorWithVoidReturnTypeTest.java | 3 +- ...tructInterceptorWithoutParametersTest.java | 3 +- .../TargetClassWithAroundConstruct.java | 4 +- .../TargetClassWithAroundConstructTest.java | 4 +- ...AroundInvokeWithInvalidParameterCount.java | 4 +- ...ndInvokeWithInvalidParameterCountTest.java | 6 +- ...hAroundInvokeWithInvalidParameterType.java | 4 +- ...undInvokeWithInvalidParameterTypeTest.java | 6 +- ...WithAroundInvokeWithInvalidReturnType.java | 4 +- ...AroundInvokeWithInvalidReturnTypeTest.java | 6 +- ...ostConstructWithInvalidParameterCount.java | 4 +- ...onstructWithInvalidParameterCountTest.java | 4 +- ...ithPostConstructWithInvalidReturnType.java | 4 +- ...ostConstructWithInvalidReturnTypeTest.java | 4 +- ...lassWithPostConstructWithThrowsClause.java | 4 +- ...WithPostConstructWithThrowsClauseTest.java | 4 +- .../TargetClassWithValidPostConstruct.java | 4 +- .../simple/SecondaryInterceptionBinding.java | 11 +- .../simple/SimpleInterceptorStereotype.java | 7 +- .../simple/SimpleInterceptorTest.java | 105 ++-- .../singleInstance/AbstractLion.java | 2 +- ...nterceptorInstancePerBeanInstanceTest.java | 4 +- .../singleInstance/TigerBinding.java | 8 +- .../spi/TargetClassInterceptorTest.java | 3 +- .../suicide/SuicidalInterceptorTest.java | 6 +- .../jboss/weld/tests/interceptors/tb/Tx.java | 10 +- .../tests/interceptors/tb/TxInterceptor.java | 3 +- .../thread/DispatchToThreadInterceptor.java | 3 +- ...ptorDispatchingToDiffferentThreadTest.java | 7 +- .../thread/async/AsyncInterceptorTest.java | 6 +- .../interceptors/thread/async/SimpleBean.java | 6 +- .../interceptors/visibility/MyPanel.java | 1 + .../UnreachableInterceptedInterfaceTest.java | 5 +- .../InterceptionWithPackagePrivateTest.java | 6 +- .../packagePrivate/pack1/SoMuchBetterFoo.java | 1 + .../pack1/VeryImportantBinding.java | 5 +- .../visibility/packagePrivate/pack2/Foo.java | 2 +- .../interceptors/weld1019/HelloBean.java | 3 +- .../tests/interceptors/weld1019/MyScope.java | 15 +- .../interceptors/weld1019/UpperCased.java | 13 +- .../weld1019/UppercasingInterceptor.java | 5 +- .../interceptors/weld1019/Weld1019Test.java | 11 +- .../weld1174/ClassTestBinding.java | 12 +- .../weld1174/InterceptedManagedBean.java | 7 +- .../weld1174/InterceptedSessionBean.java | 7 +- .../interceptors/weld1174/Interceptor0.java | 6 +- .../interceptors/weld1174/Interceptor1.java | 4 +- .../interceptors/weld1174/Interceptor2.java | 6 +- .../interceptors/weld1174/Interceptor3.java | 6 +- .../weld1174/InterceptorTest.java | 25 +- .../weld1174/MethodTestBinding.java | 12 +- .../interceptors/weld1174/VisitList.java | 1 - .../weld1391/InterceptorInvocationTest.java | 3 +- .../interceptors/weld1391/SimpleBean.java | 2 +- .../weld1410/DuplicateInterceptorTest.java | 3 +- .../InterceptorDelegatingChainTest.java | 6 +- ...dvancedInterceptorDelegatingChainTest.java | 3 +- .../FinalClassClassLevelInterceptorTest.java | 6 +- .../interceptors/weld459/fccl/FooBinding.java | 11 +- .../weld459/fccl/MissileInterceptor.java | 4 +- .../FinalClassMethodLevelInterceptorTest.java | 3 +- .../interceptors/weld459/fcml/FooBinding.java | 11 +- .../weld459/fcml/MissileInterceptor.java | 4 +- .../FinalMethodClassLevelInterceptorTest.java | 3 +- .../interceptors/weld459/fmcl/FooBinding.java | 11 +- .../weld459/fmcl/MissileInterceptor.java | 4 +- ...FinalMethodMethodLevelInterceptorTest.java | 1 - .../interceptors/weld459/fmml/FooBinding.java | 11 +- .../weld459/fmml/MissileInterceptor.java | 4 +- .../weld760/DuplicateInterceptorTest.java | 12 +- .../weld760/MyInterceptorBinding.java | 7 +- .../interceptors/weld760/MyStereotype.java | 7 +- ...ceptedBeanWithoutNoArgConstructorTest.java | 3 +- .../interceptors/weld770/SimpleBean.java | 1 - .../interceptors/weld770/Transactional.java | 5 +- .../interceptors/weld771/Transactional.java | 5 +- .../weld783/IgnoredAtEJBTest.java | 14 +- .../interceptors/weld783/MyInterceptor.java | 3 +- .../interceptors/weld783/SomeBinding.java | 5 +- .../contructs/WeldInternalConstructsTest.java | 11 +- .../java/org/jboss/weld/tests/jsf/Garply.java | 1 - .../tests/jsf/flow/FlowMultipleWarTest.java | 3 +- .../org/jboss/weld/tests/jsf/flow/Foo.java | 2 +- .../managedbeans/ManagedBeansWithCDITest.java | 9 +- .../weld/tests/jsf/weld1037/RedirectBean.java | 2 +- .../weld/tests/jsf/weld1037/Weld1037Test.java | 10 +- .../jboss/weld/tests/jsf/weld1247/Bean.java | 2 +- .../weld/tests/jsf/weld1247/Weld1247Test.java | 6 +- .../tests/lambda/LambdaConstructsTest.java | 3 +- .../lifecycle/predestroy/PreDestroyTest.java | 13 +- ...tadataForAnonymousAndLocalClassesTest.java | 7 +- .../OmniseeingExtension.java | 12 +- .../beanattributes/BeanAttributesTest.java | 3 +- .../tests/metadata/beanattributes/Foo.java | 4 +- .../qualifiers/DefaultQualifierTest.java | 3 +- .../ClassAvailableActivationTest.java | 8 +- ...ilableAndSystemPropertyActivationTest.java | 29 +- .../ClassAvailableInvertedActivationTest.java | 8 +- .../scanning/DeepPackageNameExcludeTest.java | 8 +- .../DeepPackageNameIncludeExcludeTest.java | 8 +- .../scanning/DeepPackageNameIncludeTest.java | 8 +- .../MultipleClassAvailableActivationTest.java | 8 +- ...ipleDeepPackageNameIncludeExcludeTest.java | 8 +- ...eDeepPackagePatternIncludeExcludeTest.java | 10 +- .../MultipleNameIncludeExcludeTest.java | 8 +- ...MultiplePackageNameIncludeExcludeTest.java | 8 +- .../MultiplePatternIncludeExcludeTest.java | 10 +- .../metadata/scanning/NameExcludeTest.java | 8 +- .../scanning/NameIncludeExcludeTest.java | 8 +- .../metadata/scanning/NameIncludeTest.java | 8 +- .../scanning/NonWildcardNameExcludeTest.java | 8 +- .../scanning/NonWildcardNameIncludeTest.java | 8 +- .../scanning/PackageNameExcludeTest.java | 8 +- .../PackageNameIncludeExcludeTest.java | 8 +- .../scanning/PackageNameIncludeTest.java | 8 +- .../scanning/PackagePatternExcludeTest.java | 10 +- .../PackagePatternIncludeExcludeTest.java | 10 +- .../scanning/PackagePatternIncludeTest.java | 10 +- .../metadata/scanning/PatternExcludeTest.java | 8 +- .../scanning/PatternIncludeExcludeTest.java | 10 +- .../metadata/scanning/PatternIncludeTest.java | 8 +- .../SystemPropertyActivationTest.java | 17 +- .../scanning/SystemPropertyExtension.java | 9 +- .../SystemPropertyInvertedActivationTest.java | 10 +- .../SystemPropertyValueActivationTest.java | 17 +- ...emPropertyValueInvertedActivationTest.java | 20 +- .../weld/tests/metadata/scanning/Utils.java | 15 +- .../weld/tests/named/SmokeNamedTest.java | 9 +- .../ambiguous/case1/AmbiguousName1Test.java | 5 +- .../ambiguous/case2/AmbiguousName2Test.java | 5 +- .../defaultname/DefaultBeanNameTest.java | 3 +- .../weld/tests/nonContextual/ExampleTest.java | 15 +- .../weld/tests/nonContextual/LogManager.java | 3 +- .../weld/tests/nonContextual/Random.java | 13 +- .../ServletContextListenerImpl.java | 3 +- .../nonContextual/ServletListenerTest.java | 3 +- .../injectionpoint/FlowerExtension.java | 4 +- ...NonPortableModeInjectionPointBeanTest.java | 11 +- .../custom/CustomAsyncObserverExtension.java | 4 +- .../weld/tests/observers/custom/FooBean.java | 3 +- .../ObserverConfiguratorForAsyncTest.java | 11 +- .../DecoratedObserverMethodTest.java | 23 +- .../weld/tests/observers/decoration/Job.java | 5 +- .../decoration/PackagePrivateWorker.java | 8 +- .../observers/decoration/PrivateWorker.java | 10 +- .../observers/decoration/ProtectedWorker.java | 10 +- .../observers/decoration/PublicWorker.java | 8 +- .../observers/decoration/WorkerDecorator.java | 6 +- .../ejb/local/LocalEjbObserverTest.java | 3 +- .../tests/observers/ejb/remote/FooRemote.java | 2 +- ...teEjbInInterfaceHierarchyObserverTest.java | 3 +- .../ejb/remote/RemoteEjbObserverTest.java | 3 +- ...actObserverNotificationTestSuperclass.java | 4 +- .../weld/tests/observers/extension/Angry.java | 12 +- .../tests/observers/extension/Nubian.java | 12 +- .../extension/ObserverExtension.java | 3 +- .../weld/tests/observers/extension/Tall.java | 14 +- .../ExtensionObserverOrderingTest.java | 4 +- .../ordering/UfoBelieverExtension.java | 5 +- .../ordering/UfoDisbelieverExtension.java | 4 +- .../inactivecontext/InactiveNormalScope.java | 12 +- .../InactiveNormalScopeContext.java | 4 +- .../inactivecontext/InactivePseudoScope.java | 12 +- .../InactivePseudoScopeContext.java | 4 +- .../ObserverInInactiveContextTest.java | 1 - .../inheritance/InheritanceTest.java | 4 +- .../observers/inheritance/SomeQualifier.java | 5 +- .../InterceptedObserverMethodTest.java | 6 +- .../tests/observers/interception/Juicy.java | 2 +- .../metadata/ObserverDeclaringBeanTest.java | 5 +- .../withInterception/Payload.java | 2 +- ...erverWithAnotherInterceptedMethodTest.java | 5 +- .../withInterception/SomeBinding.java | 4 +- .../pseudoscope/CustomScopedBean.java | 2 +- .../pseudoscope/CustomSingletonScope.java | 2 +- .../pseudoscope/NotifyObserverTest.java | 1 - .../weld/tests/observers/synthetic/Juicy.java | 2 +- .../SyntheticObserverIgnoredTest.java | 3 +- .../TransactionObserverOnEjbTest.java | 2 +- .../xml/location/MultipleLocationsTest.java | 3 +- .../jboss/weld/tests/parser/ParserTest.java | 4 +- .../DecoratedProducerMethodTest.java | 5 +- .../decorated/PackagePrivateWorker.java | 12 +- .../disposer/decorated/ProtectedWorker.java | 12 +- .../disposer/decorated/PublicWorker.java | 12 +- .../producer/ejb/parameterized/Dummy.java | 2 +- ...redOnParameterizedSessionBeanViewTest.java | 11 +- .../jboss/weld/tests/producer/field/Baz.java | 3 +- .../field/IntegerCollectionInjection.java | 3 +- .../ParameterizedCollectionInjection.java | 3 +- .../field/ParameterizedListInjection.java | 3 +- .../producer/field/ParameterizedProducer.java | 5 +- .../field/ParameterizedProducerTest.java | 6 +- .../field/ProducerBeanInvocationTest.java | 4 +- .../weld/tests/producer/field/Target.java | 5 +- ...nalTypeVariableArrayProducerFieldTest.java | 8 +- ...nsionalWildcardArrayProducerFieldTest.java | 7 +- .../NestedTypeVariableProducerFieldTest.java | 4 +- .../NestedWildcardProducerFieldTest.java | 4 +- .../TypeVariableArrayProducerFieldTest.java | 4 +- .../WildcardArrayProducerFieldTest.java | 4 +- .../tests/producer/field/named/Employee.java | 1 - .../field/named/NamedProducerTest.java | 32 +- .../producer/field/named/SaveAction.java | 3 +- ...ckagePrivateInterfaceTypeProducerTest.java | 3 +- .../field/nonPublicInterface/Produced.java | 13 +- .../field/nonPublicInterface/Producer.java | 2 +- .../tests/producer/interception/Alpha.java | 2 +- .../tests/producer/interception/Bravo.java | 2 +- .../tests/producer/interception/Charlie.java | 2 +- .../tests/producer/interception/Delta.java | 2 +- .../InterceptedProducerMethodTest.java | 3 +- .../jboss/weld/tests/producer/method/Baz.java | 3 +- .../tests/producer/method/Compostable.java | 15 +- .../DisposalMethodInjectionPointTest.java | 4 +- ...posalMethodOnOtherBeanNotResolvedTest.java | 11 +- .../tests/producer/method/Government.java | 4 +- .../weld/tests/producer/method/Important.java | 15 +- .../producer/method/InstanceCleanupTest.java | 1 - .../weld/tests/producer/method/Long.java | 15 +- .../producer/method/ManagerProducerTest.java | 8 +- .../tests/producer/method/NamedProducer.java | 4 +- .../producer/method/NamedProducerTest.java | 21 +- .../method/NamedProducerWithBinding.java | 9 +- .../method/NamedProducerWithBindingTest.java | 9 +- .../producer/method/NullProducerTest.java | 4 +- .../method/ProducerBeanInvocationTest.java | 4 +- .../weld/tests/producer/method/Short.java | 15 +- .../Broken_OrangeTree.java | 2 +- ...pedBeanHasInjectionPointParameterTest.java | 7 +- ...iDimensionalTypeVariableArrayProducer.java | 4 +- ...alTypeVariableArrayProducerMethodTest.java | 8 +- ...iDimensionalWildcardTypeArrayProducer.java | 4 +- ...alWildcardTypeArrayProducerMethodTest.java | 8 +- .../NestedTypeVariableProducer.java | 4 +- .../NestedTypeVariableProducerMethodTest.java | 4 +- .../NestedWildcardTypeProducer.java | 4 +- .../NestedWildcardTypeProducerMethodTest.java | 4 +- .../TypeVariableArrayProducer.java | 4 +- .../TypeVariableArrayProducerMethodTest.java | 4 +- .../WildcardTypeArrayProducer.java | 4 +- .../WildcardTypeArrayProducerMethodTest.java | 4 +- .../circular/CircularInjectionTest.java | 4 +- .../circular/StaticCircularInjectionTest.java | 4 +- .../NonTrivialCircularInjectionTest.java | 3 +- .../method/parameterized/Parameterized.java | 11 +- .../parameterized/ParameterizedTest.java | 4 +- .../receiver/ReceiverBeanLifecycleTest.java | 10 +- .../weld1368/SpecializedProducer.java | 142 ++--- .../tests/producer/weld1368/Weld1368Test.java | 31 +- .../java/org/jboss/weld/tests/proxy/Baz.java | 3 +- .../java/org/jboss/weld/tests/proxy/Foo.java | 3 +- .../org/jboss/weld/tests/proxy/ProxyTest.java | 10 +- .../org/jboss/weld/tests/proxy/Wibble.java | 3 +- .../org/jboss/weld/tests/proxy/Wobble.java | 3 +- ...jectableReferenceOptimizationTestBase.java | 3 +- ...eInjectionPointsSameDependentBeanTest.java | 3 +- .../ClientProxySerializationUnit.java | 3 +- .../tests/proxy/client/unproxyable/Juicy.java | 2 +- .../enterprise/EnterpriseBeanProxyTest.java | 15 +- .../proxy/ignoreinvalidmethods/Juicy.java | 2 +- .../ProxyIgnoreInvalidMethodsTest.java | 3 +- .../AbstractPerDeploymentInstantiator.java | 3 +- .../PerDeploymentInstantiatorWOTest.java | 4 +- .../instantiator/unsafe/NormalScopedFoo.java | 4 +- .../unsafe/NormalScopedFooInterface.java | 2 +- .../UnsafeInstantiatorClientProxyTest.java | 5 +- .../ClientProxyMethodModifiersTest.java | 2 +- .../proxy/observer/ObserverInjectionTest.java | 8 +- .../jboss/weld/tests/proxy/observer/Qux.java | 4 +- .../tests/proxy/observer/SampleObserver.java | 4 +- .../tests/proxy/privateconstructor/Bar.java | 46 +- .../tests/proxy/privateconstructor/Foo.java | 1 - .../proxy/privateconstructor/Holder.java | 1 - .../ProxyConstructorTest.java | 3 +- .../weld/tests/proxy/producer/ProxyTest.java | 8 +- .../{sealed => sealedJar}/NotSealedBean.java | 4 +- .../ProxyCreationInSealedPackageTest.java | 22 +- .../library/PackagePrivateStorage.java | 4 +- .../library/SealedBean.java | 2 +- .../ProxyCreationForSignedClassesTest.java | 22 +- .../tests/proxy/signed/insideJar/Alpha.java | 1 + .../tests/proxy/signed/insideJar/Beta.java | 2 +- ...classWithConstructorWithArgumentsTest.java | 4 +- .../superclass/instance/Weld1834Test.java | 2 +- .../proxy/superclass/named/Weld1827Test.java | 3 +- ...jectableReferenceUnproxyableCheckTest.java | 6 +- .../proxy/synthetic/SyntheticProxyTest.java | 8 +- .../UnproxyableBeanTypeValidationTest.java | 4 +- .../tests/proxy/weld1141/VarargsTest.java | 2 +- .../StaticNestedClassesProxyTest.java | 3 +- .../jboss/weld/tests/proxy/weld1664/IBar.java | 3 +- .../InterfaceStaticMethodProxyTest.java | 5 +- .../proxy/weld1766/ProducerProxyTest.java | 7 +- .../proxy/weld1779/ProducerProxyTest.java | 6 +- .../tests/proxy/weld477/ProxiabilityTest.java | 4 +- .../jboss/weld/tests/proxy/weld56/Bar.java | 46 +- .../jboss/weld/tests/proxy/weld56/Foo.java | 65 ++- .../LibraryWithQualifierInTwoWarsTest.java | 14 +- .../tests/qualifier/ear/SomeQualifier.java | 2 +- .../BeanWithRepeatableQualifierTest.java | 7 +- .../EventWithRepeatableQualifierTest.java | 4 +- ...InterceptorWithRepeatableBindingsTest.java | 3 +- .../jboss/weld/tests/repeatable/Observer.java | 3 +- .../tests/repeatable/RepeatableQualifier.java | 1 - .../weld/tests/resolution/ResolutionTest.java | 71 ++- .../jboss/weld/tests/resolution/Special.java | 13 +- .../circular/CircularDependencyTest.java | 11 +- .../resolution/circular/NormalLooping.java | 13 +- .../circular/SelfConsumingDependent.java | 13 +- .../tests/resolution/circular/Violation.java | 4 +- .../resolution/circular/resource/FooDB.java | 13 +- .../circular/self/SelfInjectionBean.java | 6 +- .../circular/self/SelfInjectionBeanTest.java | 6 +- .../circular/self/SelfIntercept.java | 4 +- .../circular/self/SelfInterceptor.java | 2 +- .../self/SingletonSelfInjectionBean.java | 4 +- .../tests/resolution/named/Important.java | 15 +- .../tests/resolution/named/NamedBeanTest.java | 13 +- .../named/NamedBeanWithBinding.java | 6 +- .../tests/resolution/wbri279/IntFactory.java | 13 +- .../tests/resolution/wbri279/Weld279Test.java | 4 +- .../resolution/weld1075/AbstractClass1.java | 1 - .../resolution/weld1075/AbstractClass2.java | 1 - .../resolution/weld1075/ConcreteClass1.java | 3 +- .../resolution/weld1075/ConcreteClass3.java | 3 +- .../tests/resolution/weld1075/Holder.java | 3 +- .../tests/resolution/weld1075/Interface1.java | 1 - .../tests/resolution/weld1075/Interface2.java | 1 - .../resolution/weld1075/ResolutionTest.java | 6 +- .../resolution/weld1723/RawBeanTypeTest.java | 7 +- .../weld/tests/resolution/weld911/Bar.java | 1 - .../tests/resolution/weld911/BarImpl.java | 1 - .../weld911/DecoratorCycleTest.java | 2 +- .../weld/tests/resources/EMFConsumer1.java | 7 +- .../weld/tests/resources/EMFConsumer2.java | 7 +- .../weld/tests/resources/EMFConsumer3.java | 7 +- .../weld/tests/resources/EMFFactoryTest.java | 32 +- ...ProducedViaInstanceFieldOnManagedBean.java | 13 +- .../ProducedViaStaticFieldOnEJB.java | 13 +- .../ProducedViaStaticFieldOnManagedBean.java | 13 +- .../weld/tests/resources/ResourceTest.java | 4 +- ...NonDependentResourceProducerFieldTest.java | 7 +- .../weld1782/ApplicationScopedObserver.java | 2 +- .../RequestScopeEventMessageDeliveryTest.java | 5 +- .../proxy/weld1782/SimpleMessageProducer.java | 3 +- .../weld1782/TopicMessageDrivenBean.java | 3 +- .../jboss/weld/tests/resources/se/Golf.java | 2 +- .../tests/resources/ws/ResourceProducer.java | 8 +- .../tests/resources/ws/TranslatorService.java | 35 +- .../resources/ws/WebServiceResourceTest.java | 3 +- .../jboss/weld/tests/scope/RemoteClient.java | 9 +- .../weld/tests/scope/RemoteScopeTest.java | 21 +- .../org/jboss/weld/tests/scope/ScopeTest.java | 11 +- .../org/jboss/weld/tests/scope/Special.java | 13 +- .../jboss/weld/tests/scope/TempConsumer.java | 1 - .../jboss/weld/tests/scope/TempProducer.java | 3 +- .../org/jboss/weld/tests/scope/Useless.java | 13 +- .../tests/scope/unproxyable/HttpParam.java | 15 +- .../scope/unproxyable/UnproxyableTest.java | 2 +- .../GenericArrayProducerNotProxyableTest.java | 5 +- .../scope/unproxyable/method/DuckLake.java | 4 +- .../NonPrivateNonStaticFinalMethodTest.java | 6 +- .../method/PrivateFinalMethodTest.java | 6 +- .../method/StaticFinalMethodTest.java | 4 +- .../members/AccessibleMemberLeakTest.java | 3 +- .../tests/serialization/LoggerConsumer.java | 5 +- .../tests/serialization/LoggerProducer.java | 3 +- .../jboss/weld/tests/serialization/Mock.java | 75 +-- .../serialization/SerializationTest.java | 16 +- .../BackedAnnotatedTypeSerializationTest.java | 3 +- .../serialization/annotated/FooExtension.java | 1 - .../annotated/id/AnnotatedTypeBdaIdTest.java | 14 +- .../noncontextual/NonContextual.java | 3 +- .../noncontextual/SerializationTest.java | 24 +- .../additional/AdditionalServiceTest.java | 21 +- .../org/jboss/weld/tests/servlet/Bar.java | 3 +- .../weld/tests/servlet/ServletBeanTest.java | 4 +- .../tests/servlet/async/AsyncServletTest.java | 6 +- .../dispatch/AbstractDispatchingTestCase.java | 3 +- .../servlet/dispatch/DispatchingTest.java | 6 +- ...DispatchingWithConversationFilterTest.java | 6 +- .../tests/servlet/dispatch/MainServlet.java | 3 +- .../weld/tests/servlet/dispatch/TestBean.java | 1 + .../org/jboss/weld/tests/smoke/Crasher.java | 1 - .../org/jboss/weld/tests/smoke/SmokeTest.java | 4 +- .../CyclicSpecializationTest.java | 9 +- .../specialization/ExtSpecializationTest.java | 9 +- ...directSpecializationNameInheritedTest.java | 3 +- .../specialization/SpecializationTest.java | 6 +- .../extension/FooQualifier.java | 12 +- .../extension/ModifyingExtension.java | 2 +- .../MultipleSpecializedClassesTest.java | 4 +- ...fterBeanDiscoveryAddedBeanArchiveTest.java | 5 +- .../extension/bean/OrangeBean.java | 2 +- .../DifferentNamesOfSpecializedBeansTest.java | 6 +- .../extension/broken/ModifyingExtension.java | 2 +- ...PreventInconsistentSpecializationTest.java | 7 +- .../modular/EarSpecializationTest.java | 17 +- .../modular/Specialization01Test.java | 14 +- .../modular/Specialization02Test.java | 14 +- .../modular/Specialization03Test.java | 17 +- .../modular/Specialization04Test.java | 17 +- .../specialization/qualifiers/Admin.java | 2 +- .../SpecializingBeanQualifiersTest.java | 8 +- ...AdvancedGenericBeanSpecializationTest.java | 7 +- .../GenericBeanSpecializationTest.java | 8 +- .../GenericSLSBRawSpecializationTest.java | 3 +- .../specialization/weld1651/MetalFan.java | 2 +- .../weld1651/SpecializedGenericBean.java | 4 +- .../GenericBeanRawSpecialization01Test.java | 2 +- .../GenericBeanRawSpecialization02Test.java | 2 +- .../GenericBeanRawSpecialization03Test.java | 7 +- .../GenericBeanSpecialization01Test.java | 3 +- .../GenericBeanSpecialization02Test.java | 2 +- ...icProducerMethodRawSpecializationTest.java | 5 +- ...ricProducerMethodSpecialization01Test.java | 6 +- .../weld802/CustomWeldClassTest.java | 5 +- .../SpecializationWithExtensionTest.java | 17 +- .../stereotypes/AnimalOrderStereotype.java | 10 +- .../tests/stereotypes/AnimalStereotype.java | 13 +- .../jboss/weld/tests/stereotypes/Order.java | 1 - .../RequestScopedAnimalStereotype.java | 9 +- .../tests/stereotypes/StereotypesTest.java | 26 +- .../AlternativeStereotypeTest.java | 3 +- .../alternative/UsefullLogicAlternative.java | 1 - .../alternative/UsefullLogicImpl.java | 1 - .../enablement/AlternativeStereotype.java | 2 +- ...AlternativeStereotypeWithPriorityTest.java | 3 +- .../alternative/enablement/StandardImpl.java | 4 +- .../AlternativePriorityStereotype.java | 6 +- .../priority/PriorityStereotype.java | 6 +- .../priority/StereotypeWithPriorityTest.java | 1 + ...ctingInheritedPriorityStereotypesTest.java | 4 +- .../ConflictingPriorityStereotypesTest.java | 2 +- .../conflicting/DualPriorityStereotype.java | 6 +- .../conflicting/PriorityStereotype2.java | 9 +- .../priority/conflicting/SomeBean.java | 1 + .../priority/inherited/DumbStereotype.java | 4 +- .../StereotypeInheritedPriorityTest.java | 1 + .../inherited/StereotypeWithPriority.java | 6 +- .../conflicting/AnotherDumbStereotype.java | 4 +- .../AnotherStereotypeWithPriority.java | 6 +- ...ereotypeInheritedPriorityConflictTest.java | 4 +- ...ReferenceDestroyedAfterInvocationTest.java | 4 +- ...ataAvailableForTransientReferenceTest.java | 6 +- .../tests/util/CategoryArchiveAppender.java | 8 +- .../tests/util/WeldExceptionTransformer.java | 2 +- .../jboss/weld/tests/util/WeldExtension.java | 2 +- ...ildFly8DeploymentExceptionTransformer.java | 6 +- .../tests/util/WildFly8EEResourceManager.java | 3 +- .../org/jboss/weld/tests/veto/VetoTest.java | 3 +- .../tests/veto/package1/package-info.java | 1 - .../weld/tests/weld1192/Weld1192Test.java | 4 +- .../ws/interceptors/EJB3EndpointImpl.java | 16 +- .../tests/ws/interceptors/EJBInterceptor.java | 8 +- .../ws/interceptors/EJBInterceptorImpl.java | 6 +- .../tests/ws/interceptors/EndpointIface.java | 5 +- .../ws/interceptors/POJOEndpointImpl.java | 8 +- .../ws/interceptors/POJOInterceptor.java | 8 +- .../ws/interceptors/POJOInterceptorImpl.java | 6 +- .../WebServiceInterceptorTest.java | 8 +- .../weld/tests/xml/broken/clazz/Bar.java | 11 +- .../xml/broken/parsing/BeansXmlTest.java | 4 +- .../tests/xml/namespaces/BeansXmlTest.java | 6 +- .../shrinkwrap/api/BeanDiscoveryMode.java | 4 +- .../shrinkwrap/impl/BeanArchiveImpl.java | 1 - .../org/jboss/shrinkwrap/impl/BeansXml.java | 19 +- .../jboss/weld/test/util/ActionSequence.java | 18 +- .../java/org/jboss/weld/test/util/Timer.java | 20 +- .../java/org/jboss/weld/test/util/Utils.java | 9 +- .../AbstractTestAnnotatedCallable.java | 18 +- .../AbstractTestAnnotatedElement.java | 3 +- .../AbstractTestAnnotatedMember.java | 11 +- .../util/annotated/ForwardingWeldClass.java | 17 +- .../annotated/TestAnnotatedConstructor.java | 9 +- .../util/annotated/TestAnnotatedField.java | 3 +- .../util/annotated/TestAnnotatedMethod.java | 8 +- .../annotated/TestAnnotatedParameter.java | 3 +- .../util/annotated/TestAnnotatedType.java | 21 +- .../annotated/TestAnnotatedTypeBuilder.java | 6 +- .../annotated/TestTypeClosureBuilder.java | 3 +- .../weld/tests/util/PropertiesBuilder.java | 2 +- .../tests/util/SystemPropertiesLoader.java | 5 +- .../org/jboss/weld/mock/MockEjbServices.java | 2 +- .../mock/cluster/AbstractClusterTest.java | 26 +- .../cluster/SwitchableSingletonProvider.java | 6 +- .../unit/bootstrap/BeansXmlMergingTest.java | 7 +- .../bootstrap/CheckableInjectionServices.java | 3 +- .../unit/bootstrap/InjectionServicesTest.java | 1 - .../unit/bootstrap/xml/BeansXmlTest.java | 4 +- .../tests/unit/bootstrap/xml/IntBind.java | 11 +- .../weld/tests/unit/bootstrap/xml/Stereo.java | 2 +- .../xml/cdi30/Beans30XmlParsingTest.java | 5 +- .../jboss/weld/tests/unit/cluster/Baz.java | 3 +- .../tests/unit/cluster/BoundRequestImpl.java | 5 +- .../jboss/weld/tests/unit/cluster/Foo.java | 3 +- .../jboss/weld/tests/unit/cluster/Horse.java | 3 +- .../tests/unit/cluster/NaiveClusterTest.java | 47 +- .../jboss/weld/tests/unit/cluster/Stable.java | 3 +- .../unit/cluster/SwitchableContainerTest.java | 4 +- .../extensions/NonBdaExtensionTest.java | 14 +- .../nonTransitiveResolution/Basic.java | 11 +- .../nonTransitiveResolution/Baz.java | 11 +- .../nonTransitiveResolution/BeansXmlImpl.java | 10 +- .../TransitiveResolutionTest.java | 34 +- .../AccessibleManagerResolutionTest.java | 18 +- .../structure/resolution/MockDeployment.java | 4 +- .../weld/tests/unit/ejb/subclass/Foo.java | 1 - .../SubclassedComponentDescriptorTest.java | 40 +- .../tests/unit/reflection/inheritance/B.java | 2 +- .../tests/unit/reflection/inheritance/C.java | 2 +- .../inheritance/TypeVariableResolverTest.java | 34 +- .../unit/resource/StaticResourceTest.java | 3 +- .../unit/resource/TestInjectionServices.java | 3 +- .../MethodHolderSerializationTest.java | 5 +- .../unit/threadlocal/ThreadLocalTestCase.java | 30 +- .../tests/unit/util/AnnotatedTypesTest.java | 42 +- .../AnnotationBuilderFactoryImpl.java | 7 +- .../translator/AnnotationBuilderImpl.java | 9 +- .../translator/AnnotationInfoImpl.java | 11 +- .../translator/AnnotationMemberImpl.java | 13 +- .../translator/AnnotationPresence.java | 9 +- .../extension/translator/AnnotationProxy.java | 6 +- .../translator/AnnotationTargetImpl.java | 11 +- .../extension/translator/ArrayTypeImpl.java | 1 + .../extension/translator/BeanInfoImpl.java | 9 +- .../BuildCompatibleExtensionLoader.java | 9 +- .../translator/BuildServicesImpl.java | 1 + .../extension/translator/ClassConfigImpl.java | 14 +- .../extension/translator/ClassInfoImpl.java | 19 +- .../extension/translator/ClassTypeImpl.java | 1 + .../translator/DeclarationInfoImpl.java | 15 +- .../translator/DisposerInfoImpl.java | 2 +- .../translator/ExtensionInvoker.java | 16 +- .../ExtensionMethodParameterType.java | 9 +- .../extension/translator/ExtensionPhase.java | 4 +- .../translator/ExtensionPhaseBase.java | 15 +- .../translator/ExtensionPhaseEnhancement.java | 29 +- .../ExtensionPhaseEnhancementAction.java | 2 +- .../ExtensionPhaseRegistration.java | 31 +- .../translator/ExtensionPhaseSynthesis.java | 7 +- .../extension/translator/FieldConfigImpl.java | 10 +- .../extension/translator/FieldInfoImpl.java | 7 +- .../translator/InjectionPointInfoImpl.java | 7 +- .../translator/InterceptorInfoImpl.java | 8 +- .../translator/LiteExtensionTranslator.java | 49 +- .../extension/translator/MessagesImpl.java | 1 + .../translator/MetaAnnotationsImpl.java | 19 +- .../translator/MethodConfigImpl.java | 14 +- .../MethodConstructorConfigImpl.java | 14 +- .../extension/translator/MethodInfoImpl.java | 21 +- .../translator/ObserverInfoImpl.java | 9 +- .../extension/translator/PackageInfoImpl.java | 7 +- .../translator/ParameterConfigImpl.java | 10 +- .../translator/ParameterInfoImpl.java | 21 +- .../translator/ParameterizedTypeImpl.java | 12 +- .../extension/translator/ParametersImpl.java | 4 +- .../translator/PrimitiveTypeImpl.java | 5 +- .../translator/ScannedClassesImpl.java | 1 + .../extension/translator/SecurityActions.java | 12 +- .../translator/StereotypeInfoImpl.java | 12 +- .../translator/SyntheticBeanBuilderImpl.java | 16 +- .../SyntheticComponentBuilderBase.java | 6 +- .../translator/SyntheticComponentsImpl.java | 7 +- .../SyntheticObserverBuilderImpl.java | 13 +- .../lite/extension/translator/TypeImpl.java | 13 +- .../translator/TypeVariableImpl.java | 11 +- .../lite/extension/translator/TypesImpl.java | 1 + .../extension/translator/VoidTypeImpl.java | 1 + .../translator/WildcardTypeImpl.java | 3 +- .../LiteExtensionTranslatorLogger.java | 12 +- .../reflection/AnnotatedArrayTypeImpl.java | 4 +- .../AnnotatedParameterizedTypeImpl.java | 7 +- .../util/reflection/AnnotatedTypeImpl.java | 4 +- .../reflection/AnnotatedTypeVariableImpl.java | 4 +- .../reflection/AnnotatedWildcardTypeImpl.java | 4 +- .../util/reflection/WildcardTypeImpl.java | 6 +- 2378 files changed, 14380 insertions(+), 10677 deletions(-) rename tests-arquillian/src/test/java/org/jboss/weld/tests/proxy/{sealed => sealedJar}/NotSealedBean.java (91%) rename tests-arquillian/src/test/java/org/jboss/weld/tests/proxy/{sealed => sealedJar}/ProxyCreationInSealedPackageTest.java (74%) rename tests-arquillian/src/test/java/org/jboss/weld/tests/proxy/{sealed => sealedJar}/library/PackagePrivateStorage.java (94%) rename tests-arquillian/src/test/java/org/jboss/weld/tests/proxy/{sealed => sealedJar}/library/SealedBean.java (95%) diff --git a/.gitignore b/.gitignore index 2ccf56c743c..eee1fc13f65 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .settings .factorypath .vscode/ +.cache *.ipr .idea *.iws diff --git a/environments/common/src/main/java/org/jboss/weld/environment/ContainerInstance.java b/environments/common/src/main/java/org/jboss/weld/environment/ContainerInstance.java index 68b384dd339..e6255f1abcc 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/ContainerInstance.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/ContainerInstance.java @@ -27,7 +27,8 @@ public interface ContainerInstance { /** - * Returns a BeanManager used by this container. If the container uses multiple BeanManager instances it is not defined which of them is returned. + * Returns a BeanManager used by this container. If the container uses multiple BeanManager instances it is not defined + * which of them is returned. * * @return beanManager */ diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/AbstractWeldDeployment.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/AbstractWeldDeployment.java index c0f925de405..02df9e586b2 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/AbstractWeldDeployment.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/AbstractWeldDeployment.java @@ -39,7 +39,7 @@ public abstract class AbstractWeldDeployment implements CDI11Deployment { public static final String BEANS_XML = "META-INF/beans.xml"; - public static final String[] RESOURCES = {BEANS_XML}; + public static final String[] RESOURCES = { BEANS_XML }; private final ServiceRegistry serviceRegistry; @@ -58,5 +58,4 @@ public Iterable> getExtensions() { return extensions; } - } diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldBeanDeploymentArchive.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldBeanDeploymentArchive.java index 53e05323a9e..e1c50619a74 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldBeanDeploymentArchive.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldBeanDeploymentArchive.java @@ -51,7 +51,8 @@ public class WeldBeanDeploymentArchive extends AbstractWeldBeanDeploymentArchive * @param beansXml * @param accessibleBeanDeploymentArchives */ - public WeldBeanDeploymentArchive(String id, Collection beanClasses, BeansXml beansXml, Set beanDeploymentArchives) { + public WeldBeanDeploymentArchive(String id, Collection beanClasses, BeansXml beansXml, + Set beanDeploymentArchives) { this(id, beanClasses, null, beansXml, beanDeploymentArchives, Collections.emptySet()); } @@ -64,7 +65,9 @@ public WeldBeanDeploymentArchive(String id, Collection beanClasses, Bean * @param beanDeploymentArchives * @param loadedBeanClasses */ - public WeldBeanDeploymentArchive(String id, Collection beanClasses, Collection knownClasses, BeansXml beansXml, Set accessibleBeanDeploymentArchives, Collection> loadedBeanClasses) { + public WeldBeanDeploymentArchive(String id, Collection beanClasses, Collection knownClasses, + BeansXml beansXml, Set accessibleBeanDeploymentArchives, + Collection> loadedBeanClasses) { super(id); this.beanClasses = beanClasses; this.knownClasses = knownClasses; @@ -90,7 +93,8 @@ public WeldBeanDeploymentArchive(String id, Collection beanClasses, Bean * @param knownClasses * @param beansXml */ - public WeldBeanDeploymentArchive(String id, Collection beanClasses, Collection knownClasses, BeansXml beansXml) { + public WeldBeanDeploymentArchive(String id, Collection beanClasses, Collection knownClasses, + BeansXml beansXml) { this(id, beanClasses, knownClasses, beansXml, Collections.emptySet(), Collections.emptySet()); } @@ -119,7 +123,6 @@ public BeansXml getBeansXml() { return beansXml; } - public synchronized void setAccessibleBeanDeploymentArchives(Set beanDeploymentArchives) { accessibleBeanDeploymentArchives = Collections.unmodifiableSet(new HashSet<>(beanDeploymentArchives)); } @@ -138,7 +141,8 @@ void addBeanClass(String className) { * @param archives * @return the "flat" bean deployment archive */ - public static WeldBeanDeploymentArchive merge(CDI11Bootstrap bootstrap, Iterable archives) { + public static WeldBeanDeploymentArchive merge(CDI11Bootstrap bootstrap, + Iterable archives) { BeansXml mergedBeansXml = BeansXmlParser.mergeExisting(archives, true); Set beanClasses = new HashSet(); for (BeanDeploymentArchive archive : archives) { diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldDeployment.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldDeployment.java index 47091b9cae4..20b38b3c8df 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldDeployment.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/WeldDeployment.java @@ -47,10 +47,12 @@ public class WeldDeployment extends AbstractWeldDeployment { * * @param resourceLoader * @param bootstrap - * @param beanDeploymentArchives The set should be mutable so that additional bean deployment archives can be eventually added + * @param beanDeploymentArchives The set should be mutable so that additional bean deployment archives can be eventually + * added * @param extensions */ - public WeldDeployment(ResourceLoader resourceLoader, Bootstrap bootstrap, Set beanDeploymentArchives, + public WeldDeployment(ResourceLoader resourceLoader, Bootstrap bootstrap, + Set beanDeploymentArchives, Iterable> extensions) { super(bootstrap, extensions); this.beanDeploymentArchives = beanDeploymentArchives; @@ -58,7 +60,6 @@ public WeldDeployment(ResourceLoader resourceLoader, Bootstrap bootstrap, Set getBeanDeploymentArchives() { return Collections. unmodifiableSet(beanDeploymentArchives); @@ -74,7 +75,7 @@ public BeanDeploymentArchive loadBeanDeploymentArchive(Class beanClass) { } @Override - public WeldBeanDeploymentArchive getBeanDeploymentArchive(Class beanClass) { + public WeldBeanDeploymentArchive getBeanDeploymentArchive(Class beanClass) { for (WeldBeanDeploymentArchive beanDeploymentArchive : beanDeploymentArchives) { if (beanDeploymentArchive.getKnownClasses().contains(beanClass.getName())) { return beanDeploymentArchive; @@ -96,13 +97,15 @@ protected WeldBeanDeploymentArchive getAndUpdateAdditionalBeanDeploymentArchive( } /** - * Additional bean deployment archives are used for extentions, synthetic annotated types and beans which do not come from a bean archive. + * Additional bean deployment archives are used for extentions, synthetic annotated types and beans which do not come from a + * bean archive. * * @param beanClass * @return the additional bean deployment archive */ protected WeldBeanDeploymentArchive createAdditionalBeanDeploymentArchive() { - WeldBeanDeploymentArchive additionalBda = new WeldBeanDeploymentArchive(ADDITIONAL_BDA_ID, Collections.synchronizedSet(new HashSet()), null); + WeldBeanDeploymentArchive additionalBda = new WeldBeanDeploymentArchive(ADDITIONAL_BDA_ID, + Collections.synchronizedSet(new HashSet()), null); additionalBda.getServices().addAll(getServices().entrySet()); beanDeploymentArchives.add(additionalBda); setBeanDeploymentArchivesAccessibility(); diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/AbstractDiscoveryStrategy.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/AbstractDiscoveryStrategy.java index c682c8be774..52c78e9ec83 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/AbstractDiscoveryStrategy.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/AbstractDiscoveryStrategy.java @@ -49,7 +49,7 @@ * @author Martin Kouba * @author Jozef Hartinger * @author Laird Nelson + * target="_parent">Laird Nelson */ public abstract class AbstractDiscoveryStrategy implements DiscoveryStrategy { @@ -78,8 +78,8 @@ protected AbstractDiscoveryStrategy() { * @param emptyBeansXmlDiscoveryMode */ public AbstractDiscoveryStrategy(ResourceLoader resourceLoader, Bootstrap bootstrap, - Set> initialBeanDefiningAnnotations, - BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { + Set> initialBeanDefiningAnnotations, + BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { handlers = new LinkedList(); setResourceLoader(resourceLoader); setBootstrap(bootstrap); @@ -147,7 +147,7 @@ public Set performDiscovery() { for (Iterator iterator = beanArchiveBuilders.iterator(); iterator.hasNext();) { BeanArchiveBuilder builder = iterator.next(); BeansXml beansXml = builder.getBeansXml(); - if(beansXml != null) { + if (beansXml != null) { switch (beansXml.getBeanDiscoveryMode()) { case ALL: addToArchives(archives, processAllDiscovery(builder)); @@ -192,7 +192,8 @@ protected void addToArchives(Set deploymentArchives, } /** - * Initialize the strategy before accessing found BeanArchiveBuilder builders. Best used for saving some information before the process method for each + * Initialize the strategy before accessing found BeanArchiveBuilder builders. Best used for saving some information before + * the process method for each * builder is called. */ protected void beforeDiscovery(Collection builders) { diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveBuilder.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveBuilder.java index d2fe77837cb..c27aea471f7 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveBuilder.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveBuilder.java @@ -28,7 +28,8 @@ import org.jboss.weld.util.Preconditions; /** - * A class used to store information about the bean archive and to build the {@link org.jboss.weld.environment.deployment.WeldBeanDeploymentArchive} + * A class used to store information about the bean archive and to build the + * {@link org.jboss.weld.environment.deployment.WeldBeanDeploymentArchive} * instance from the gathered information. * * @author Matej Briškár @@ -96,7 +97,8 @@ public Set getClasses() { } public BeanArchiveBuilder setAttribute(String key, Object value) { - attributes.put(key, value); return this; + attributes.put(key, value); + return this; } public Object getAttribute(String key) { diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveHandler.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveHandler.java index ad80cb39435..82bfb357705 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveHandler.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveHandler.java @@ -21,12 +21,15 @@ /** * Handles the reference to a bean archive. *

- * The standard way to register a handler is via {@link DiscoveryStrategy#registerHandler(BeanArchiveHandler)}. Alternatively, handlers may be registered using + * The standard way to register a handler is via {@link DiscoveryStrategy#registerHandler(BeanArchiveHandler)}. Alternatively, + * handlers may be registered using * the {@link ServiceLoader} mechanism. *

*

- * Additionaly, handlers could specify their priority using {@code jakarta.annotation.Priority}. Handlers with higher priority have precedence. The default - * priority is 0. Handlers registered programatically have the default priority {@code registeredHandlers.size - index}, i.e. derived from the order they were + * Additionaly, handlers could specify their priority using {@code jakarta.annotation.Priority}. Handlers with higher priority + * have precedence. The default + * priority is 0. Handlers registered programatically have the default priority {@code registeredHandlers.size - index}, i.e. + * derived from the order they were * inserted. *

* diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveScanner.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveScanner.java index b1dae5b786d..c112353b7a8 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveScanner.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/BeanArchiveScanner.java @@ -25,7 +25,8 @@ /** * Scans the application for bean archives. * - * The implementation may be optimized for bean archives containing beans.xml file with bean-discovey-mode of none. E.g. it does not have to scan classes in + * The implementation may be optimized for bean archives containing beans.xml file with bean-discovey-mode of none. E.g. it does + * not have to scan classes in * such an archive. * * @author Martin Kouba @@ -59,7 +60,8 @@ public String getBeanArchiveRef() { /** * - * @return the beans.xml representation or null in case of a candidate for an implicit bean archive with no beans.xml + * @return the beans.xml representation or null in case of a candidate for an implicit bean archive with no + * beans.xml */ public BeansXml getBeansXml() { return beansXml; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ClassPathBeanArchiveScanner.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ClassPathBeanArchiveScanner.java index d1734f68cd9..bfbcdb37629 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ClassPathBeanArchiveScanner.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ClassPathBeanArchiveScanner.java @@ -153,7 +153,8 @@ private void scanJarFile(File entryFile, ImmutableList.Builder resul if (beansXmlEntry != null) { logger.debugv(BEANS_XML_FOUND_MESSAGE, entryFile); BeansXml beansXml = parseBeansXml( - new URL(PROCOTOL_JAR + ":" + entryFile.toURI().toURL().toExternalForm() + JAR_URL_SEPARATOR + beansXmlEntry.getName())); + new URL(PROCOTOL_JAR + ":" + entryFile.toURI().toURL().toExternalForm() + JAR_URL_SEPARATOR + + beansXmlEntry.getName())); if (accept(beansXml)) { results.add(new ScanResult(beansXml, entryFile.getPath())); } diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java index f27426aa03f..f6ad0fa7a22 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DefaultBeanArchiveScanner.java @@ -60,7 +60,8 @@ public class DefaultBeanArchiveScanner extends AbstractBeanArchiveScanner { * @param resourceLoader * @param bootstrap */ - public DefaultBeanArchiveScanner(ResourceLoader resourceLoader, Bootstrap bootstrap, BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { + public DefaultBeanArchiveScanner(ResourceLoader resourceLoader, Bootstrap bootstrap, + BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { super(bootstrap, emptyBeansXmlDiscoveryMode); this.resourceLoader = resourceLoader; } @@ -98,10 +99,10 @@ protected String getBeanArchiveReference(URL url) { CommonLogger.LOG.couldNotReadResource(url, e); } - if(PROCOTOL_FILE.equals(url.getProtocol())) { + if (PROCOTOL_FILE.equals(url.getProtocol())) { // Adapt file URL, e.g. "file:///home/weld/META-INF/beans.xml" becomes "/home/weld" ref = new File(uri.getSchemeSpecificPart()).getParentFile().getParent(); - } else if(PROCOTOL_JAR.equals(url.getProtocol())) { + } else if (PROCOTOL_JAR.equals(url.getProtocol())) { // Attempt to adapt JAR file URL, e.g. "jar:file:/home/duke/duke.jar!/META-INF/beans.xml" becomes "/home/duke/duke.jar" // NOTE: Some class loaders may support nested jars, e.g. "jar:file:/home/duke/duke.jar!/lib/foo.jar!/META-INF/beans.xml" becomes // "/home/duke/duke.jar!/lib/foo.jar" @@ -109,7 +110,7 @@ protected String getBeanArchiveReference(URL url) { // The decoded part without protocol part, i.e. without "jar:" ref = uri.getSchemeSpecificPart(); - if(ref.lastIndexOf(JAR_URL_SEPARATOR) > 0) { + if (ref.lastIndexOf(JAR_URL_SEPARATOR) > 0) { ref = ref.substring(0, ref.lastIndexOf(JAR_URL_SEPARATOR)); } ref = getBeanArchiveReferenceForJar(ref, url); @@ -137,7 +138,7 @@ protected String getBeanArchiveReferenceForJar(String path, URL fallback) { ClassLoader jnlpClassLoader = WeldResourceLoader.getClassLoader(); Class jnlpClClass = jnlpClassLoader.getClass(); - try{ + try { // Detecting if running inside icedtea-web JNLP runtime if (jnlpClClass.getName().equals("net.sourceforge.jnlp.runtime.classloader.JNLPClassLoader")) { // Try to get field net.sourceforge.jnlp.runtime.JNLPClassLoader#tracker from icedtea-web 1.5 diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategy.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategy.java index 6749f8154de..0cf4450ab76 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategy.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategy.java @@ -17,7 +17,6 @@ package org.jboss.weld.environment.deployment.discovery; import java.lang.annotation.Annotation; - import java.util.Set; import org.jboss.weld.bootstrap.api.Bootstrap; @@ -31,7 +30,7 @@ * @author Matej Briškár * @author Martin Kouba * @author Laird Nelson + * target="_parent">Laird Nelson */ public interface DiscoveryStrategy { @@ -56,12 +55,13 @@ public interface DiscoveryStrategy { * implementation may use when discovering beans. * * @param initialBeanDefiningAnnotations the initial {@link Set} - * of bean defining annotations + * of bean defining annotations */ void setInitialBeanDefiningAnnotations(Set> initialBeanDefiningAnnotations); /** - * Optionally, a client may set a custom scanner implementation. If not set, the impl is allowed to use anything it considers appropriate. + * Optionally, a client may set a custom scanner implementation. If not set, the impl is allowed to use anything it + * considers appropriate. * * @param beanArchiveScanner */ diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyFactory.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyFactory.java index 13000c090a2..05af8d8fccc 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyFactory.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyFactory.java @@ -32,7 +32,7 @@ /** * @author Martin Kouba * @author Laird Nelson + * target="_parent">Laird Nelson */ public final class DiscoveryStrategyFactory { @@ -47,10 +47,11 @@ private DiscoveryStrategyFactory() { * @return the discovery strategy */ public static DiscoveryStrategy create(ResourceLoader resourceLoader, Bootstrap bootstrap, - Set> initialBeanDefiningAnnotations, boolean jandexStrategyDisabled, - BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { + Set> initialBeanDefiningAnnotations, boolean jandexStrategyDisabled, + BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { DiscoveryStrategy returnValue = null; - final Iterator> iterator = ServiceLoader.load(DiscoveryStrategy.class, resourceLoader).iterator(); + final Iterator> iterator = ServiceLoader.load(DiscoveryStrategy.class, resourceLoader) + .iterator(); if (iterator != null && iterator.hasNext()) { final DiscoveryStrategy candidate = iterator.next().getValue(); if (candidate != null) { @@ -70,8 +71,9 @@ public static DiscoveryStrategy create(ResourceLoader resourceLoader, Bootstrap initialBeanDefiningAnnotations, emptyBeansXmlDiscoveryMode); } catch (Exception e) { throw CommonLogger.LOG.unableToInstantiate(Jandex.JANDEX_DISCOVERY_STRATEGY_CLASS_NAME, - Arrays.toString(new Object[] { resourceLoader, bootstrap, - initialBeanDefiningAnnotations, emptyBeansXmlDiscoveryMode }), e); + Arrays.toString(new Object[] { resourceLoader, bootstrap, + initialBeanDefiningAnnotations, emptyBeansXmlDiscoveryMode }), + e); } } } diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/FileSystemBeanArchiveHandler.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/FileSystemBeanArchiveHandler.java index 1baef5a4ccb..9276b0f9016 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/FileSystemBeanArchiveHandler.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/FileSystemBeanArchiveHandler.java @@ -59,7 +59,7 @@ public BeanArchiveBuilder handle(String path) { file = new File(path); } - if(!file.canRead()) { + if (!file.canRead()) { return null; } @@ -70,7 +70,7 @@ public BeanArchiveBuilder handle(String path) { if (file.isDirectory()) { handleDirectory(new DirectoryEntry().setFile(file), builder); } else { - if(nested) { + if (nested) { handleNestedFile(path, file, builder); } else { handleFile(file, builder); @@ -87,7 +87,8 @@ protected void handleFile(File file, BeanArchiveBuilder builder) throws IOExcept log.debugv("Handle archive file: {0}", file); try (ZipFile zip = new ZipFile(file)) { Enumeration entries = zip.entries(); - ZipFileEntry entry = new ZipFileEntry(PROCOTOL_JAR + ":" + file.toURI().toURL().toExternalForm() + JAR_URL_SEPARATOR); + ZipFileEntry entry = new ZipFileEntry( + PROCOTOL_JAR + ":" + file.toURI().toURL().toExternalForm() + JAR_URL_SEPARATOR); while (entries.hasMoreElements()) { add(entry.setName(entries.nextElement().getName()), builder); } @@ -99,7 +100,7 @@ protected void handleDirectory(DirectoryEntry entry, BeanArchiveBuilder builder) File[] files = entry.getFile().listFiles(); String parentPath = entry.getName(); for (File child : files) { - if(entry.getName() != null ) { + if (entry.getName() != null) { entry.setPath(entry.getName() + "/" + child.getName()); } else { entry.setPath(child.getName()); @@ -142,7 +143,8 @@ protected void handleNestedFile(String path, File file, BeanArchiveBuilder build } } else if (zipEntry.getName().startsWith(nestedEntryName)) { // Nested file entries - add(getZipFileEntry(file, zipEntry).setName(zipEntry.getName().substring(nestedEntryName.length() + 1)), builder); + add(getZipFileEntry(file, zipEntry).setName(zipEntry.getName().substring(nestedEntryName.length() + 1)), + builder); } } } @@ -152,7 +154,8 @@ private ZipFileEntry getZipFileEntry(File file, ZipEntry zipEntry) throws Malfor // Reconstruct the archive URL. It might be like either of the following: // "jar:file:/home/duke/duke.jar!/classes" // "jar:file:/home/duke/duke.jar!/lib/foo.jar" - return new ZipFileEntry(PROCOTOL_JAR + ":" + file.toURI().toURL().toExternalForm() + JAR_URL_SEPARATOR + zipEntry.getName()); + return new ZipFileEntry( + PROCOTOL_JAR + ":" + file.toURI().toURL().toExternalForm() + JAR_URL_SEPARATOR + zipEntry.getName()); } protected void add(Entry entry, BeanArchiveBuilder builder) throws MalformedURLException { diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ReflectionDiscoveryStrategy.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ReflectionDiscoveryStrategy.java index c6b3565a750..6b7d9f8a466 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ReflectionDiscoveryStrategy.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/ReflectionDiscoveryStrategy.java @@ -29,7 +29,8 @@ import org.jboss.weld.resources.spi.ResourceLoader; /** - * This implementation supports bean-discovery-mode="annotated" and makes use of reflection to detect a class with a bean defining annotation. + * This implementation supports bean-discovery-mode="annotated" and makes use of reflection to detect a class with a bean + * defining annotation. * * @author Matej Briškár * @author Martin Kouba @@ -39,8 +40,8 @@ public class ReflectionDiscoveryStrategy extends AbstractDiscoveryStrategy { private final AtomicBoolean annotatedDiscoveryProcessed; public ReflectionDiscoveryStrategy(ResourceLoader resourceLoader, Bootstrap bootstrap, - Set> initialBeanDefiningAnnotations, - BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { + Set> initialBeanDefiningAnnotations, + BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { super(resourceLoader, bootstrap, initialBeanDefiningAnnotations, emptyBeansXmlDiscoveryMode); this.annotatedDiscoveryProcessed = new AtomicBoolean(false); registerHandler(new FileSystemBeanArchiveHandler()); diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/Jandex.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/Jandex.java index 140ea66a5d8..af2faeb259c 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/Jandex.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/Jandex.java @@ -37,9 +37,12 @@ public static JandexDiscoveryStrategy createJandexDiscoveryStrategy(ResourceLoad Set> initialBeanDefiningAnnotations, BeanDiscoveryMode emptyBeansXmlDiscoveryMode) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { - Class strategyClass = Reflections.loadClass(resourceLoader, JANDEX_DISCOVERY_STRATEGY_CLASS_NAME); + Class strategyClass = Reflections.loadClass(resourceLoader, + JANDEX_DISCOVERY_STRATEGY_CLASS_NAME); return SecurityActions - .newConstructorInstance(strategyClass, new Class[] { ResourceLoader.class, Bootstrap.class, Set.class, BeanDiscoveryMode.class }, resourceLoader, bootstrap, + .newConstructorInstance(strategyClass, + new Class[] { ResourceLoader.class, Bootstrap.class, Set.class, BeanDiscoveryMode.class }, + resourceLoader, bootstrap, initialBeanDefiningAnnotations, emptyBeansXmlDiscoveryMode); } diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileInfo.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileInfo.java index 10ce2e6033c..45045662e20 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileInfo.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileInfo.java @@ -54,7 +54,8 @@ public class JandexClassFileInfo implements ClassFileInfo { private static final Logger log = Logger.getLogger(JandexClassFileInfo.class); - public JandexClassFileInfo(String className, IndexView index, ComputingCache> annotationClassAnnotationsCache, ClassLoader classLoader) { + public JandexClassFileInfo(String className, IndexView index, + ComputingCache> annotationClassAnnotationsCache, ClassLoader classLoader) { this.index = index; this.annotationClassAnnotationsCache = annotationClassAnnotationsCache; this.classInfo = index.getClassByName(DotName.createSimple(className)); @@ -228,7 +229,8 @@ private boolean isAssignableFrom(String className, Class fromClass) { /** * @param to * @param name - * @return true if the name is equal to the fromName, or if the name represents a superclass or superinterface of the fromName, + * @return true if the name is equal to the fromName, or if the name represents a superclass or superinterface + * of the fromName, * false otherwise */ private boolean isAssignableTo(DotName name, Class to) { @@ -262,7 +264,8 @@ private boolean isAssignableTo(DotName name, Class to) { return false; } - private boolean containsAnnotation(ClassInfo classInfo, DotName requiredAnnotationName, Class requiredAnnotation) { + private boolean containsAnnotation(ClassInfo classInfo, DotName requiredAnnotationName, + Class requiredAnnotation) { // Type and members if (classInfo.annotationsMap().containsKey(requiredAnnotationName)) { return true; @@ -309,7 +312,8 @@ private boolean containsAnnotation(ClassInfo classInfo, DotName requiredAnnotati } // Meta-annotations for (AnnotationInstance annotation : method.annotations()) { - if (annotationClassAnnotationsCache.getValue(annotation.name()).contains(requiredAnnotationName.toString())) { + if (annotationClassAnnotationsCache.getValue(annotation.name()) + .contains(requiredAnnotationName.toString())) { return true; } } @@ -339,4 +343,3 @@ public String toString() { return classInfo.toString(); } } - diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileServices.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileServices.java index 808202ac3d2..f4e4c50b438 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileServices.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexClassFileServices.java @@ -32,7 +32,8 @@ import org.jboss.weld.util.collections.ImmutableSet; /** - * Jandex implementation of the {@link ClassFileServices}), which is a service that is a faster alternative to get info about class without a need to load it + * Jandex implementation of the {@link ClassFileServices}), which is a service that is a faster alternative to get info about + * class without a need to load it * with ClassLoader. * * @author Matej Briškár diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexDiscoveryStrategy.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexDiscoveryStrategy.java index 408a5d412be..304d058359c 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexDiscoveryStrategy.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/JandexDiscoveryStrategy.java @@ -61,8 +61,8 @@ public class JandexDiscoveryStrategy extends AbstractDiscoveryStrategy { private JandexClassFileServices classFileServices; public JandexDiscoveryStrategy(ResourceLoader resourceLoader, Bootstrap bootstrap, - Set> initialBeanDefiningAnnotations, - BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { + Set> initialBeanDefiningAnnotations, + BeanDiscoveryMode emptyBeansXmlDiscoveryMode) { super(resourceLoader, bootstrap, initialBeanDefiningAnnotations, emptyBeansXmlDiscoveryMode); registerHandler(new JandexIndexBeanArchiveHandler()); registerHandler(new JandexFileSystemBeanArchiveHandler()); @@ -108,7 +108,8 @@ protected WeldBeanDeploymentArchive processAnnotatedDiscovery(BeanArchiveBuilder return builder.build(); } - private Set buildBeanDefiningAnnotationSet(Set> initialBeanDefiningAnnotations, CompositeIndex index) { + private Set buildBeanDefiningAnnotationSet(Set> initialBeanDefiningAnnotations, + CompositeIndex index) { ImmutableSet.Builder beanDefiningAnnotations = ImmutableSet.builder(); for (Class annotation : initialBeanDefiningAnnotations) { final DotName annotationDotName = DotName.createSimple(annotation.getName()); diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/SecurityActions.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/SecurityActions.java index 023cc771f35..6022d7344e0 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/SecurityActions.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/SecurityActions.java @@ -61,11 +61,13 @@ static T newInstance(Class javaClass) throws InstantiationException, Ille * @throws NoSuchMethodException * @throws InvocationTargetException */ - static T newConstructorInstance(Class javaClass, Class[] constructorParamTypes, Object... constructorParamInstances) + static T newConstructorInstance(Class javaClass, Class[] constructorParamTypes, + Object... constructorParamInstances) throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { if (System.getSecurityManager() != null) { try { - return AccessController.doPrivileged(ConstructorNewInstanceAction.of(javaClass, constructorParamTypes, constructorParamInstances)); + return AccessController.doPrivileged( + ConstructorNewInstanceAction.of(javaClass, constructorParamTypes, constructorParamInstances)); } catch (PrivilegedActionException e) { throw new WeldException(e.getCause()); } diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/package-info.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/package-info.java index ab0884fd3a6..38aa15b19e8 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/package-info.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/jandex/package-info.java @@ -16,5 +16,5 @@ */ @Vetoed package org.jboss.weld.environment.deployment.discovery.jandex; -import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/package-info.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/package-info.java index d08410df955..5afd10ad6b3 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/package-info.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/discovery/package-info.java @@ -16,5 +16,5 @@ */ @Vetoed package org.jboss.weld.environment.deployment.discovery; -import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/deployment/package-info.java b/environments/common/src/main/java/org/jboss/weld/environment/deployment/package-info.java index 789a2147981..cecf73c0a8a 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/deployment/package-info.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/deployment/package-info.java @@ -16,5 +16,5 @@ */ @Vetoed package org.jboss.weld.environment.deployment; -import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/logging/CommonLogger.java b/environments/common/src/main/java/org/jboss/weld/environment/logging/CommonLogger.java index 4a201738885..4e145a5640c 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/logging/CommonLogger.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/logging/CommonLogger.java @@ -16,7 +16,6 @@ */ package org.jboss.weld.environment.logging; - import jakarta.enterprise.inject.UnsatisfiedResolutionException; import org.jboss.logging.Logger; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/logging/package-info.java b/environments/common/src/main/java/org/jboss/weld/environment/logging/package-info.java index 57864050bef..9e8cb28b151 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/logging/package-info.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/logging/package-info.java @@ -16,5 +16,5 @@ */ @Vetoed package org.jboss.weld.environment.logging; -import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/package-info.java b/environments/common/src/main/java/org/jboss/weld/environment/package-info.java index 7b67cbbc4af..02286c1ca43 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/package-info.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/package-info.java @@ -16,5 +16,5 @@ */ @Vetoed package org.jboss.weld.environment; -import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/util/BeanArchives.java b/environments/common/src/main/java/org/jboss/weld/environment/util/BeanArchives.java index 00c50a9070a..1daf3b991ea 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/util/BeanArchives.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/util/BeanArchives.java @@ -13,7 +13,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.weld.environment.util; + */ +package org.jboss.weld.environment.util; import java.util.Collection; import java.util.HashSet; @@ -44,7 +45,8 @@ private BeanArchives() { * @param beanArchives * @return a {@link Multimap} that maps problematic bean class to the set of bean archives where it is deployed */ - public static Multimap findBeanClassesDeployedInMultipleBeanArchives(Set beanArchives) { + public static Multimap findBeanClassesDeployedInMultipleBeanArchives( + Set beanArchives) { if (beanArchives.size() == 1) { return Multimaps.emptyMultimap(); @@ -90,7 +92,8 @@ public static MultimapFirst, the windows file separators found in beanArchiveRef are converted to slashes *
  • {@code base} value is appended
    • *
  • {@link BeanArchives#BEAN_ARCHIVE_ID_BASE_DELIMITER} is appended
    • - *
  • If the {@code beanArchiveRef} contains the separator, the substring (beginning at the separator index) is appended
    • + *
  • If the {@code beanArchiveRef} contains the separator, the substring (beginning at the separator index) is + * appended
    • *
  • Otherwise, the whole {@code beanArchiveRef} value is appended
    • * * The id should be consistent between multiple occurrences of the deployment. diff --git a/environments/common/src/main/java/org/jboss/weld/environment/util/Reflections.java b/environments/common/src/main/java/org/jboss/weld/environment/util/Reflections.java index 12b633c4939..40766b1c77e 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/util/Reflections.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/util/Reflections.java @@ -39,7 +39,8 @@ */ public final class Reflections { - public static final List> META_ANNOTATIONS = ImmutableList.of(Stereotype.class, NormalScope.class); + public static final List> META_ANNOTATIONS = ImmutableList.of(Stereotype.class, + NormalScope.class); private Reflections() { } @@ -116,7 +117,8 @@ public static Class loadClass(ResourceLoader resourceLoader, String class } /** - * First try to load a class using the specified ResourceLoader. If not successful, try {@link Class#forName(String)} as a fallback. + * First try to load a class using the specified ResourceLoader. If not successful, try {@link Class#forName(String)} as a + * fallback. * * @param resourceLoader * @param className @@ -140,9 +142,11 @@ public static Class classForName(ResourceLoader resourceLoader, String cl * * @param annotations * @param metaAnnotationType - * @return true if any of the annotations specified has the given meta annotation type specified, false otherwise + * @return true if any of the annotations specified has the given meta annotation type specified, + * false otherwise */ - public static boolean hasBeanDefiningMetaAnnotationSpecified(Annotation[] annotations, Class metaAnnotationType) { + public static boolean hasBeanDefiningMetaAnnotationSpecified(Annotation[] annotations, + Class metaAnnotationType) { for (Annotation annotation : annotations) { if (annotation.annotationType().isAnnotationPresent(metaAnnotationType)) { return true; @@ -155,7 +159,8 @@ public static boolean containsAnnotations(Annotation[] annotations, Class requiredAnnotation, boolean checkMetaAnnotations) { + private static boolean containsAnnotation(Annotation[] annotations, Class requiredAnnotation, + boolean checkMetaAnnotations) { for (Annotation annotation : annotations) { Class annotationType = annotation.annotationType(); if (requiredAnnotation.equals(annotationType)) { @@ -168,7 +173,8 @@ private static boolean containsAnnotation(Annotation[] annotations, Class clazz, Set> initialBeanDefiningAnnotations) { + public static boolean hasBeanDefiningAnnotation(Class clazz, + Set> initialBeanDefiningAnnotations) { for (Class beanDefiningAnnotation : initialBeanDefiningAnnotations) { if (clazz.isAnnotationPresent(beanDefiningAnnotation)) { return true; diff --git a/environments/common/src/main/java/org/jboss/weld/environment/util/package-info.java b/environments/common/src/main/java/org/jboss/weld/environment/util/package-info.java index 8bc8f6f3848..b63f17d0336 100644 --- a/environments/common/src/main/java/org/jboss/weld/environment/util/package-info.java +++ b/environments/common/src/main/java/org/jboss/weld/environment/util/package-info.java @@ -16,5 +16,5 @@ */ @Vetoed package org.jboss.weld.environment.util; -import jakarta.enterprise.inject.Vetoed; +import jakarta.enterprise.inject.Vetoed; diff --git a/environments/common/src/test/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyTest.java b/environments/common/src/test/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyTest.java index 0b66f7239a0..6ea20868145 100644 --- a/environments/common/src/test/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyTest.java +++ b/environments/common/src/test/java/org/jboss/weld/environment/deployment/discovery/DiscoveryStrategyTest.java @@ -35,7 +35,8 @@ public class DiscoveryStrategyTest { @Test public void testBeanArchiveHandlers() { AbstractDiscoveryStrategy strategy = (AbstractDiscoveryStrategy) DiscoveryStrategyFactory - .create(new ClassLoaderResourceLoader(getClass().getClassLoader()), null, Collections.emptySet(), true, BeanDiscoveryMode.ANNOTATED); + .create(new ClassLoaderResourceLoader(getClass().getClassLoader()), null, Collections.emptySet(), true, + BeanDiscoveryMode.ANNOTATED); strategy.registerHandler(new TestHandler2()); List handlers = strategy.initBeanArchiveHandlers(); assertEquals(3, handlers.size()); diff --git a/environments/common/src/test/java/org/jboss/weld/environment/util/BeanArchivesTest.java b/environments/common/src/test/java/org/jboss/weld/environment/util/BeanArchivesTest.java index f134e7de516..8150562865f 100644 --- a/environments/common/src/test/java/org/jboss/weld/environment/util/BeanArchivesTest.java +++ b/environments/common/src/test/java/org/jboss/weld/environment/util/BeanArchivesTest.java @@ -45,7 +45,8 @@ public void testFindBeanClassesDeployedInMultipleBeanArchives() { BeanDeploymentArchive bda1 = new WeldBeanDeploymentArchive("foo", ImmutableList.of(beanClass), null); BeanDeploymentArchive bda2 = new WeldBeanDeploymentArchive("bar", ImmutableList.of(beanClass), null); - Multimap problems = BeanArchives.findBeanClassesDeployedInMultipleBeanArchives(Collections.singleton(bda1)); + Multimap problems = BeanArchives + .findBeanClassesDeployedInMultipleBeanArchives(Collections.singleton(bda1)); assertTrue(problems.isEmpty()); problems = BeanArchives.findBeanClassesDeployedInMultipleBeanArchives(ImmutableSet.of(bda1, bda2)); @@ -64,13 +65,19 @@ public void testFindBeanClassesDeployedInMultipleBeanArchives() { @Test public void testExtractBeanArchiveId() { assertEquals("/foo_/WEB-INF/classes", - BeanArchives.extractBeanArchiveId("/tmp/tomcat/webapps/87b26796-2e95-4f64-8039-409ae1d1b705/WEB-INF/classes", "/foo", "/WEB-INF")); + BeanArchives.extractBeanArchiveId("/tmp/tomcat/webapps/87b26796-2e95-4f64-8039-409ae1d1b705/WEB-INF/classes", + "/foo", "/WEB-INF")); assertEquals("_/WEB-INF/classes", - BeanArchives.extractBeanArchiveId("/tmp/tomcat/webapps/87b26796-2e95-4f64-8039-409ae1d1b705/WEB-INF/classes", "", "/WEB-INF")); + BeanArchives.extractBeanArchiveId("/tmp/tomcat/webapps/87b26796-2e95-4f64-8039-409ae1d1b705/WEB-INF/classes", + "", "/WEB-INF")); assertEquals("/foo_/WEB-INF/lib/bar.jar", - BeanArchives.extractBeanArchiveId("file:///tmp/tomcat/webapps/87b26796-2e95-4f64-8039-409ae1d1b705/WEB-INF/lib/bar.jar", "/foo", "/WEB-INF")); + BeanArchives.extractBeanArchiveId( + "file:///tmp/tomcat/webapps/87b26796-2e95-4f64-8039-409ae1d1b705/WEB-INF/lib/bar.jar", "/foo", + "/WEB-INF")); assertEquals("/foo_/WEB-INF/classes", - BeanArchives.extractBeanArchiveId("C:\\tmp\\tomcat\\webapps\\87b26796-2e95-4f64-8039-409ae1d1b705\\WEB-INF\\classes", "/foo", "/WEB-INF")); + BeanArchives.extractBeanArchiveId( + "C:\\tmp\\tomcat\\webapps\\87b26796-2e95-4f64-8039-409ae1d1b705\\WEB-INF\\classes", "/foo", + "/WEB-INF")); assertEquals("_/test/producer/0.1.0-SNAPSHOT/producer-0.1.0-SNAPSHOT.jar", BeanArchives.extractBeanArchiveId("/test/producer/0.1.0-SNAPSHOT/producer-0.1.0-SNAPSHOT.jar", "", "/WEB-INF")); } diff --git a/environments/common/src/test/java/org/jboss/weld/environment/util/ReflectionsTest.java b/environments/common/src/test/java/org/jboss/weld/environment/util/ReflectionsTest.java index 5abda2fe294..eeae3601f18 100644 --- a/environments/common/src/test/java/org/jboss/weld/environment/util/ReflectionsTest.java +++ b/environments/common/src/test/java/org/jboss/weld/environment/util/ReflectionsTest.java @@ -40,9 +40,12 @@ public class ReflectionsTest { @Test public void testHasMetaAnnotationSpecified() { assertFalse(Reflections.hasBeanDefiningMetaAnnotationSpecified(new Annotation[] {}, NormalScope.class)); - assertTrue(Reflections.hasBeanDefiningMetaAnnotationSpecified(new Annotation[] {NamedLiteral.DEFAULT, FooStereotype.LITERAL}, Stereotype.class)); - assertFalse(Reflections.hasBeanDefiningMetaAnnotationSpecified(new Annotation[] {NamedLiteral.DEFAULT, FooStereotype.LITERAL}, NormalScope.class)); - assertTrue(Reflections.hasBeanDefiningMetaAnnotationSpecified(new Annotation[] {NamedLiteral.DEFAULT, FooNormalScoped.LITERAL}, NormalScope.class)); + assertTrue(Reflections.hasBeanDefiningMetaAnnotationSpecified( + new Annotation[] { NamedLiteral.DEFAULT, FooStereotype.LITERAL }, Stereotype.class)); + assertFalse(Reflections.hasBeanDefiningMetaAnnotationSpecified( + new Annotation[] { NamedLiteral.DEFAULT, FooStereotype.LITERAL }, NormalScope.class)); + assertTrue(Reflections.hasBeanDefiningMetaAnnotationSpecified( + new Annotation[] { NamedLiteral.DEFAULT, FooNormalScoped.LITERAL }, NormalScope.class)); } @Stereotype diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/ContainerLifecycleObserver.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/ContainerLifecycleObserver.java index a2593b8ee38..06841ba4c3e 100644 --- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/ContainerLifecycleObserver.java +++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/ContainerLifecycleObserver.java @@ -67,8 +67,10 @@ /** * Represents a synthetic container lifecycle event observer. *

    - * For parameterized container lifecycele events (such as {@link ProcessAnnotatedType} and {@link ProcessProducerMethod}) it is possible to specify the observed - * container lifecycle event type, e.g. by means of {@link TypeLiteral}. To receive notifications for all observer methods with observed event type of + * For parameterized container lifecycele events (such as {@link ProcessAnnotatedType} and {@link ProcessProducerMethod}) it is + * possible to specify the observed + * container lifecycle event type, e.g. by means of {@link TypeLiteral}. To receive notifications for all observer methods with + * observed event type of * {@link String}: * * 

    @@ -115,7 +117,8 @@ public static Builder afterBeanDiscovery() {
      * @return a new container lifecycle observer
      * @see AfterBeanDiscovery
      */
-    public static ContainerLifecycleObserver afterBeanDiscovery(Consumer callback) {
+    public static ContainerLifecycleObserver afterBeanDiscovery(
+            Consumer callback) {
         return afterBeanDiscovery().notify(callback);
     }
 
@@ -154,7 +157,8 @@ public static Builder afterDeploymentValidation() {
      * @return a new container lifecycle observer
      * @see AfterDeploymentValidation
      */
-    public static ContainerLifecycleObserver afterDeploymentValidation(Consumer callback) {
+    public static ContainerLifecycleObserver afterDeploymentValidation(
+            Consumer callback) {
         return afterDeploymentValidation().notify(callback);
     }
 
@@ -492,7 +496,8 @@ public static Builder> processSyntheticBean(Type observe
 
     private volatile SyntheticExtension extension;
 
-    private ContainerLifecycleObserver(int priority, Type observedType, BiConsumer callbackWithBeanManager, Consumer callback,
+    private ContainerLifecycleObserver(int priority, Type observedType, BiConsumer callbackWithBeanManager,
+            Consumer callback,
             Collection> requiredAnnotations) {
         this.priority = priority;
         this.observedType = observedType;
@@ -631,7 +636,8 @@ public Builder priority(int priority) {
         }
 
         /**
-         * The annotations are only considered for {@link ProcessAnnotatedType}, i.e. they are ignored for other container lifecycle events.
+         * The annotations are only considered for {@link ProcessAnnotatedType}, i.e. they are ignored for other container
+         * lifecycle events.
          *
          * @param annotations
          * @return self
@@ -645,7 +651,8 @@ public final Builder withAnnotations(Class... annotatio
         }
 
         /**
-         * Set a callback used during observer notification. The first callback parameter is an event object and the second parameter is a {@link BeanManager}
+         * Set a callback used during observer notification. The first callback parameter is an event object and the second
+         * parameter is a {@link BeanManager}
          * instance.
          * 
    
          * This is a terminal operation.
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/StartMain.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/StartMain.java
index 6e2add0ff9d..fd6a145733c 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/StartMain.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/StartMain.java
@@ -18,11 +18,12 @@
 
 import jakarta.enterprise.inject.Vetoed;
 
-import org.jboss.weld.environment.se.logging.WeldSELogger;
 import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
+import org.jboss.weld.environment.se.logging.WeldSELogger;
 
 /**
- * This is the main class that can be called from the command line for a WeldContainer SE app which makes use of the ContainerInitialized event. Something like:
+ * This is the main class that can be called from the command line for a WeldContainer SE app which makes use of the
+ * ContainerInitialized event. Something like:
  * 
  * java -cp weld-se-shaded.jar:my-app.jar org.jboss.weld.environment.se.StartMain arg1 arg2
  * 
@@ -55,7 +56,7 @@ public WeldContainer go() {
     public static void main(String[] args) {
         try {
             new StartMain(args).go();
-        } catch(Throwable t) {
+        } catch (Throwable t) {
             WeldSELogger.LOG.error("Application exited with an exception", t);
             System.exit(1);
         }
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java
index 204c838727c..f3b9818f8ee 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/Weld.java
@@ -132,7 +132,8 @@
  *
    * *

    - * By default, the discovery is enabled so that all beans from all discovered bean archives are considered. However, it's possible to define a "synthetic" bean + * By default, the discovery is enabled so that all beans from all discovered bean archives are considered. However, it's + * possible to define a "synthetic" bean * archive, or the set of bean classes and enablement respectively: *

    * @@ -150,21 +151,23 @@ * * *

    - * In the same manner, it is possible to explicitly declare interceptors, decorators, extensions and Weld-specific options (such as relaxed construction) using + * In the same manner, it is possible to explicitly declare interceptors, decorators, extensions and Weld-specific options (such + * as relaxed construction) using * the builder. *

    * * 
      * Weld builder = new Weld()
- *  .disableDiscovery()
- *  .packages(Main.class, Utils.class)
- *  .interceptors(TransactionalInterceptor.class)
- *  .property("org.jboss.weld.construction.relaxed", true);
+ *         .disableDiscovery()
+ *         .packages(Main.class, Utils.class)
+ *         .interceptors(TransactionalInterceptor.class)
+ *         .property("org.jboss.weld.construction.relaxed", true);
  * WeldContainer container = builder.initialize();
  *
    * *

    - * The builder is reusable which means that it's possible to initialize multiple Weld containers with one builder. However, note that containers must have a + * The builder is reusable which means that it's possible to initialize multiple Weld containers with one builder. However, note + * that containers must have a * unique identifier assigned when running multiple Weld instances at the same time. *

    * @@ -178,7 +181,8 @@ public class Weld extends SeContainerInitializer implements ContainerInstanceFactory { /** - * By default, the set of bean-defining annotations is fixed. If set to a {@link Set} of annotation classes, the set of bean-defining annotations is + * By default, the set of bean-defining annotations is fixed. If set to a {@link Set} of annotation classes, the set of + * bean-defining annotations is * augmented with the contents of the {@link Set}. *

    * This key can be used through {@link #property(String, Object}. @@ -186,7 +190,8 @@ public class Weld extends SeContainerInitializer implements ContainerInstanceFac public static final String ADDITIONAL_BEAN_DEFINING_ANNOTATIONS_PROPERTY = "org.jboss.weld.se.additionalBeanDefiningAnnotations"; /** - * By default, bean archive isolation is enabled. If set to false, Weld will use a "flat" deployment structure - all bean classes share the same bean + * By default, bean archive isolation is enabled. If set to false, Weld will use a "flat" deployment structure - all bean + * classes share the same bean * archive and all beans.xml descriptors are automatically merged into one. *

    * This key can be also used through {@link #property(String, Object)}. @@ -202,7 +207,8 @@ public class Weld extends SeContainerInitializer implements ContainerInstanceFac /** * Standard behavior is that empty {@code beans.xml} is treated as discovery mode {@code annotated}. - * This configuration property allows to change the behavior to discovery mode {@code all} which is how it used to work prior to + * This configuration property allows to change the behavior to discovery mode {@code all} which is how it used to work + * prior to * CDI 4.0. *

    * Note that this option is temporary and servers to easy migration. As such, it will be eventually removed. @@ -210,14 +216,16 @@ public class Weld extends SeContainerInitializer implements ContainerInstanceFac public static final String EMPTY_BEANS_XML_DISCOVERY_MODE_ALL = "org.jboss.weld.se.discovery.emptyBeansXmlModeAll"; /** - * By default, Weld automatically registers shutdown hook during initialization. If set to false, the registration of a shutdown hook is skipped. + * By default, Weld automatically registers shutdown hook during initialization. If set to false, the registration of a + * shutdown hook is skipped. *

    * This key can be also used through {@link #property(String, Object)}. */ public static final String SHUTDOWN_HOOK_SYSTEM_PROPERTY = "org.jboss.weld.se.shutdownHook"; /** - * By default, Weld SE does not support implicit bean archives without beans.xml. If set to true, Weld scans the class path entries and implicit bean + * By default, Weld SE does not support implicit bean archives without beans.xml. If set to true, Weld scans the class path + * entries and implicit bean * archives which don't contain a beans.xml file are also supported. *

    * This key can be also used through {@link #property(String, Object)}. @@ -230,8 +238,10 @@ public class Weld extends SeContainerInitializer implements ContainerInstanceFac public static final String JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT = "jakarta.enterprise.inject.scan.implicit"; /** - * By default, Weld is allowed to perform efficient cleanup and further optimizations after bootstrap. This feature is normally controlled by integrator - * through {@link ConfigurationKey#ALLOW_OPTIMIZED_CLEANUP} but in Weld SE a client of the bootstrap API is de facto in the role of integrator. + * By default, Weld is allowed to perform efficient cleanup and further optimizations after bootstrap. This feature is + * normally controlled by integrator + * through {@link ConfigurationKey#ALLOW_OPTIMIZED_CLEANUP} but in Weld SE a client of the bootstrap API is de facto in the + * role of integrator. *

    * This key can be also used through {@link #property(String, Object)}. */ @@ -357,10 +367,12 @@ public Weld addBeanClasses(Class... classes) { } /** - * All classes from the packages of the specified classes will be added to the set of bean classes for the synthetic bean archive. + * All classes from the packages of the specified classes will be added to the set of bean classes for the synthetic bean + * archive. * *

    - * Note that the scanning possibilities are limited. Therefore, only directories and jar files from the filesystem are supported. + * Note that the scanning possibilities are limited. Therefore, only directories and jar files from the filesystem are + * supported. *

    * *

    @@ -377,7 +389,8 @@ public Weld packages(Class... packageClasses) { } /** - * Packages of the specified classes will be scanned and found classes will be added to the set of bean classes for the synthetic bean archive. + * Packages of the specified classes will be scanned and found classes will be added to the set of bean classes for the + * synthetic bean archive. * * @param scanRecursively * @param packageClasses @@ -411,7 +424,8 @@ public Weld addPackages(boolean scanRecursively, Package... packages) { } /** - * A package of the specified class will be scanned and found classes will be added to the set of bean classes for the synthetic bean archive. + * A package of the specified class will be scanned and found classes will be added to the set of bean classes for the + * synthetic bean archive. * * @param scanRecursively * @param packageClass @@ -483,7 +497,8 @@ public Weld addContainerLifecycleObserver(ContainerLifecycleObserver observer /** * Enable interceptors for the synthetic bean archive, all previous values are removed. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param interceptorClasses @@ -498,7 +513,8 @@ public Weld interceptors(Class... interceptorClasses) { /** * Add an interceptor class to the list of enabled interceptors for the synthetic bean archive. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param interceptorClass @@ -520,7 +536,8 @@ public Weld enableInterceptors(Class... interceptorClasses) { /** * Enable decorators for the synthetic bean archive, all previous values are removed. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param decoratorClasses @@ -535,7 +552,8 @@ public Weld decorators(Class... decoratorClasses) { /** * Add a decorator class to the list of enabled decorators for the synthetic bean archive. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param decoratorClass @@ -557,7 +575,8 @@ public Weld enableDecorators(Class... decoratorClasses) { /** * Select alternatives for the synthetic bean archive, all previous values are removed. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param alternativeClasses @@ -572,7 +591,8 @@ public Weld alternatives(Class... alternativeClasses) { /** * Add an alternative class to the list of selected alternatives for a synthetic bean archive. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param alternativeClass @@ -594,7 +614,8 @@ public Weld selectAlternatives(Class... alternativeClasses) { /** * Select alternative stereotypes for the synthetic bean archive, all previous values are removed. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param alternativeStereotypeClasses @@ -619,7 +640,8 @@ public Weld selectAlternativeStereotypes(Class... alternat /** * Add an alternative stereotype class to the list of selected alternative stereotypes for a synthetic bean archive. *

    - * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to compensate the absence of the + * This method does not add any class to the set of bean classes for the synthetic bean archive. It's purpose is solely to + * compensate the absence of the * beans.xml descriptor. * * @param alternativeStereotypeClass @@ -676,7 +698,8 @@ public Weld setProperties(Map propertiesMap) { * {@link org.jboss.weld.transaction.spi.TransactionServices}. *

    *

    - * Service implementation may specify their priority using {@link Priority}. Services with higher priority have precedence. Services that do not specify + * Service implementation may specify their priority using {@link Priority}. Services with higher priority have precedence. + * Services that do not specify * priority have the default priority of 4500. *

    * @@ -686,7 +709,8 @@ public Weld setProperties(Map propertiesMap) { */ public Weld addServices(Service... services) { for (Service service : services) { - for (Class serviceInterface : Services.identifyServiceInterfaces(service.getClass(), new HashSet<>())) { + for (Class serviceInterface : Services.identifyServiceInterfaces(service.getClass(), + new HashSet<>())) { additionalServices.put(serviceInterface, service); } } @@ -695,9 +719,11 @@ public Weld addServices(Service... services) { /** * Sets the bean discovery mode for synthetic bean archive. Default mode is ANNOTATED. - * @param mode bean discovery mode in a form of an enum from {@link org.jboss.weld.bootstrap.spi.BeanDiscoveryMode}. Accepted values are ALL, ANNOTATED * - * @return self + * @param mode bean discovery mode in a form of an enum from {@link org.jboss.weld.bootstrap.spi.BeanDiscoveryMode}. + * Accepted values are ALL, ANNOTATED + * + * @return self * @throws IllegalArgumentException if BeanDiscoveryMode.NONE is passed as an argument */ public Weld setBeanDiscoveryMode(BeanDiscoveryMode mode) { @@ -752,7 +778,8 @@ public Weld enableDiscovery() { } /** - * By default, the discovery is enabled. However, it's possible to disable the discovery completely so that only the "synthetic" bean archive is considered. + * By default, the discovery is enabled. However, it's possible to disable the discovery completely so that only the + * "synthetic" bean archive is considered. * * @return self */ @@ -771,13 +798,17 @@ public boolean isDiscoveryEnabled() { } /** - * Bootstraps a new Weld SE container with the current container id (generated value if not set through {@link #containerId(String)}). + * Bootstraps a new Weld SE container with the current container id (generated value if not set through + * {@link #containerId(String)}). *

    - * The container must be shut down properly when an application is stopped. Applications are encouraged to use the try-with-resources statement or invoke + * The container must be shut down properly when an application is stopped. Applications are encouraged to use the + * try-with-resources statement or invoke * {@link WeldContainer#shutdown()} explicitly. *

    - * However, a shutdown hook is also registered during initialization so that all running containers are shut down automatically when a program exits or VM - * is terminated. This means that it's not necessary to implement the shutdown logic in a class where a main method is used to start the container. + * However, a shutdown hook is also registered during initialization so that all running containers are shut down + * automatically when a program exits or VM + * is terminated. This means that it's not necessary to implement the shutdown logic in a class where a main method is used + * to start the container. * * @return the Weld container * @see #enableDiscovery() @@ -786,7 +817,8 @@ public boolean isDiscoveryEnabled() { public WeldContainer initialize() { // If also building a synthetic bean archive or the implicit scan is enabled, the check for beans.xml is not necessary - if (!isSyntheticBeanArchiveRequired() && !isImplicitScanEnabled() && resourceLoader.getResource(WeldDeployment.BEANS_XML) == null) { + if (!isSyntheticBeanArchiveRequired() && !isImplicitScanEnabled() + && resourceLoader.getResource(WeldDeployment.BEANS_XML) == null) { throw CommonLogger.LOG.missingBeansXml(); } @@ -845,7 +877,8 @@ public void shutdown() { } /** - * Set a {@link ClassLoader}. The given {@link ClassLoader} will be scanned automatically for bean archives if scanning is enabled. + * Set a {@link ClassLoader}. The given {@link ClassLoader} will be scanned automatically for bean archives if scanning is + * enabled. * * @param classLoader * @return self @@ -857,7 +890,8 @@ public Weld setClassLoader(ClassLoader classLoader) { } /** - * Set a {@link ResourceLoader} used to scan the application for bean archives. If you only want to use a specific {@link ClassLoader} for scanning, use + * Set a {@link ResourceLoader} used to scan the application for bean archives. If you only want to use a specific + * {@link ClassLoader} for scanning, use * {@link #setClassLoader(ClassLoader)} instead. * * @param resourceLoader @@ -930,7 +964,8 @@ public Weld addBeanDefiningAnnotations(Class... annotation /** *

    - * Extensions to Weld SE can subclass and override this method to customize the deployment before weld boots up. For example, to add a custom + * Extensions to Weld SE can subclass and override this method to customize the deployment before weld boots up. For + * example, to add a custom * ResourceLoader, you would subclass Weld like so: *

    * @@ -955,23 +990,25 @@ public Weld addBeanDefiningAnnotations(Class... annotation */ protected Deployment createDeployment(ResourceLoader resourceLoader, CDI11Bootstrap bootstrap) { - final BeanDiscoveryMode emptyBeansXmlDiscoveryMode = isEnabled(EMPTY_BEANS_XML_DISCOVERY_MODE_ALL, false) ? BeanDiscoveryMode.ALL : BeanDiscoveryMode.ANNOTATED; + final BeanDiscoveryMode emptyBeansXmlDiscoveryMode = isEnabled(EMPTY_BEANS_XML_DISCOVERY_MODE_ALL, false) + ? BeanDiscoveryMode.ALL + : BeanDiscoveryMode.ANNOTATED; final Iterable> extensions = getExtensions(); final TypeDiscoveryConfiguration typeDiscoveryConfiguration = bootstrap.startExtensions(extensions); final Deployment deployment; final Set beanDeploymentArchives = new HashSet(); final Map, Service> additionalServices = new HashMap<>(this.additionalServices); final Set> beanDefiningAnnotations = ImmutableSet.> builder() - .addAll(typeDiscoveryConfiguration.getKnownBeanDefiningAnnotations()) - // Add ThreadScoped manually as Weld SE doesn't support implicit bean archives without beans.xml - .add(ThreadScoped.class) - // Add all custom bean defining annotations user registered via Weld.addBeanDefiningAnnotations() - .addAll(extendedBeanDefiningAnnotations) - .build(); + .addAll(typeDiscoveryConfiguration.getKnownBeanDefiningAnnotations()) + // Add ThreadScoped manually as Weld SE doesn't support implicit bean archives without beans.xml + .add(ThreadScoped.class) + // Add all custom bean defining annotations user registered via Weld.addBeanDefiningAnnotations() + .addAll(extendedBeanDefiningAnnotations) + .build(); if (discoveryEnabled) { DiscoveryStrategy strategy = DiscoveryStrategyFactory.create(resourceLoader, bootstrap, - beanDefiningAnnotations, isEnabled(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, false), + beanDefiningAnnotations, isEnabled(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, false), emptyBeansXmlDiscoveryMode); if (isImplicitScanEnabled()) { strategy.setScanner(new ClassPathBeanArchiveScanner(bootstrap, emptyBeansXmlDiscoveryMode)); @@ -994,13 +1031,14 @@ beanDefiningAnnotations, isEnabled(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, fal for (String className : setOfAllBeanClasses) { Class clazz = Reflections.loadClass(resourceLoader, className); if (clazz != null && Reflections.hasBeanDefiningAnnotation(clazz, beanDefiningAnnotations)) { - filteredSetbuilder.add(className); + filteredSetbuilder.add(className); } } setOfAllBeanClasses = filteredSetbuilder.build(); } - WeldBeanDeploymentArchive syntheticBeanArchive = new WeldBeanDeploymentArchive(WeldDeployment.SYNTHETIC_BDA_ID, setOfAllBeanClasses, null, - buildSyntheticBeansXml(), Collections.emptySet(), ImmutableSet.copyOf(beanClasses)); + WeldBeanDeploymentArchive syntheticBeanArchive = new WeldBeanDeploymentArchive(WeldDeployment.SYNTHETIC_BDA_ID, + setOfAllBeanClasses, null, + buildSyntheticBeansXml(), Collections.emptySet(), ImmutableSet.copyOf(beanClasses)); beanDeploymentArchives.add(syntheticBeanArchive); } @@ -1008,11 +1046,13 @@ beanDefiningAnnotations, isEnabled(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, fal throw WeldSELogger.LOG.weldContainerCannotBeInitializedNoBeanArchivesFound(); } - Multimap problems = BeanArchives.findBeanClassesDeployedInMultipleBeanArchives(beanDeploymentArchives); + Multimap problems = BeanArchives + .findBeanClassesDeployedInMultipleBeanArchives(beanDeploymentArchives); if (!problems.isEmpty()) { // Right now, we only log a warning for each bean class deployed in multiple bean archives for (Entry> entry : problems.entrySet()) { - WeldSELogger.LOG.beanClassDeployedInMultipleBeanArchives(entry.getKey(), WeldCollections.toMultiRowString(entry.getValue())); + WeldSELogger.LOG.beanClassDeployedInMultipleBeanArchives(entry.getKey(), + WeldCollections.toMultiRowString(entry.getValue())); } } @@ -1034,7 +1074,8 @@ beanDefiningAnnotations, isEnabled(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, fal } /** - * Utility method allowing managed instances of beans to provide entry points for non-managed beans (such as {@link WeldContainer}). Should only called once + * Utility method allowing managed instances of beans to provide entry points for non-managed beans (such as + * {@link WeldContainer}). Should only called once * Weld has finished booting. * * @param manager the BeanManager to use to access the managed instance @@ -1044,7 +1085,8 @@ beanDefiningAnnotations, isEnabled(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, fal * @throws IllegalArgumentException if the given type represents a type variable * @throws IllegalArgumentException if two instances of the same qualifier type are given * @throws IllegalArgumentException if an instance of an annotation that is not a qualifier type is given - * @throws UnsatisfiedResolutionException if no beans can be resolved * @throws AmbiguousResolutionException if the ambiguous dependency resolution rules + * @throws UnsatisfiedResolutionException if no beans can be resolved * @throws AmbiguousResolutionException if the + * ambiguous dependency resolution rules * fail * @throws IllegalArgumentException if the given type is not a bean type of the given bean */ @@ -1058,7 +1100,8 @@ protected T getInstanceByType(BeanManager manager, Class type, Annotation } protected boolean isImplicitScanEnabled() { - return isEnabled(SCAN_CLASSPATH_ENTRIES_SYSTEM_PROPERTY, false) || isEnabled(JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, false); + return isEnabled(SCAN_CLASSPATH_ENTRIES_SYSTEM_PROPERTY, false) + || isEnabled(JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, false); } protected boolean isSyntheticBeanArchiveRequired() { @@ -1084,7 +1127,8 @@ protected Iterable> getExtensions() { if (weldSEBeanRegistrant == null) { try { weldSEBeanRegistrant = SecurityActions.newInstance(WeldSEBeanRegistrant.class); - result.add(new MetadataImpl(weldSEBeanRegistrant, SYNTHETIC_LOCATION_PREFIX + WeldSEBeanRegistrant.class.getName())); + result.add(new MetadataImpl(weldSEBeanRegistrant, + SYNTHETIC_LOCATION_PREFIX + WeldSEBeanRegistrant.class.getName())); } catch (Exception e) { throw new RuntimeException(e); } @@ -1111,8 +1155,10 @@ private Iterable> loadExtensions(ResourceLoader resourceLoad } protected BeansXml buildSyntheticBeansXml() { - return new BeansXmlImpl(ImmutableList.copyOf(selectedAlternatives), ImmutableList.copyOf(selectedAlternativeStereotypes), - ImmutableList.copyOf(enabledDecorators), ImmutableList.copyOf(enabledInterceptors), Scanning.EMPTY_SCANNING, null, beanDiscoveryMode, null, false); + return new BeansXmlImpl(ImmutableList.copyOf(selectedAlternatives), + ImmutableList.copyOf(selectedAlternativeStereotypes), + ImmutableList.copyOf(enabledDecorators), ImmutableList.copyOf(enabledInterceptors), Scanning.EMPTY_SCANNING, + null, beanDiscoveryMode, null, false); } private MetadataImpl syntheticMetadata(Class clazz) { @@ -1141,7 +1187,8 @@ protected Set scanPackages() { if (PROCOTOL_FILE.equals(resourceUrl.getProtocol())) { File file = new File(resourceUri); - handleDir(file.isDirectory() ? file : file.getParentFile(), packInfo.isScanRecursively(), packName, foundClasses); + handleDir(file.isDirectory() ? file : file.getParentFile(), packInfo.isScanRecursively(), packName, + foundClasses); } else if (PROCOTOL_JAR.equals(resourceUrl.getProtocol())) { handleJar(resourceUri, packInfo.isScanRecursively(), packName, foundClasses); } else { @@ -1267,7 +1314,8 @@ private void parseAdditionalBeanDefiningAnnotations() { } // parse from system properties - String stringValue = AccessController.doPrivileged(new GetSystemPropertyAction(ADDITIONAL_BEAN_DEFINING_ANNOTATIONS_PROPERTY)); + String stringValue = AccessController + .doPrivileged(new GetSystemPropertyAction(ADDITIONAL_BEAN_DEFINING_ANNOTATIONS_PROPERTY)); if (stringValue != null) { for (String className : stringValue.split(",")) { if (!className.isEmpty()) { @@ -1301,7 +1349,8 @@ private static class PackInfo { this.packName = packClass.getPackage().getName(); this.packClassName = packClass.getName(); this.scanRecursively = recursiveScan; - this.classLoaderRef = new WeakReference(AccessController.doPrivileged(new GetClassLoaderAction(packClass))); + this.classLoaderRef = new WeakReference( + AccessController.doPrivileged(new GetClassLoaderAction(packClass))); } PackInfo(Package pack, boolean recursiveScan) { diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldContainer.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldContainer.java index 0f1a69c60f1..156a083c2f9 100644 --- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldContainer.java +++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldContainer.java @@ -73,7 +73,8 @@ * * *

    - * {@link #shutdown()} must be always called to shutdown the container properly. AutoCloseable is implemented, so the container is automatically shut down when + * {@link #shutdown()} must be always called to shutdown the container properly. AutoCloseable is implemented, so the container + * is automatically shut down when * leaving the try-with-resources block: *

    * @@ -88,7 +89,8 @@ *

    * *

    - * Provides convenient access to beans, BeanManager and events, which is particularly helpful when bootstrapping an application in Java SE: + * Provides convenient access to beans, BeanManager and events, which is particularly helpful when bootstrapping an application + * in Java SE: *

    * * 
    @@ -132,6 +134,7 @@ public static WeldContainer instance(String id) {
     /**
      * A convenient method for {@link CDI.current()}. Returns current {@link WeldContainer} instance
      * if there is exactly one instance running. Throws {@link IllegalStateException} in any other case.
+     *
      * @return Current {@link WeldContainer} instance if and only if exactly one instance exists
      * @throws {@link IllegalStateException} if there is 0 or more than 1 instance running
      */
@@ -237,7 +240,8 @@ private void complete() {
 
     private void fireContainerInitializedEvent() {
         WeldSELogger.LOG.weldContainerInitialized(id);
-        beanManager().getEvent().select(ContainerInitialized.class, Initialized.Literal.APPLICATION).fire(new ContainerInitialized(id));
+        beanManager().getEvent().select(ContainerInitialized.class, Initialized.Literal.APPLICATION)
+                .fire(new ContainerInitialized(id));
         Environment env = Container.getEnvironment();
         if (env != null && env.automaticallyHandleStartupShutdownEvents()) {
             beanManager().getEvent().select(Startup.class, Any.Literal.INSTANCE).fire(new Startup());
@@ -308,12 +312,14 @@ public synchronized void shutdown() {
                 beanManager().getEvent().select(Shutdown.class, Any.Literal.INSTANCE).fire(new Shutdown());
             }
             // followed up by BeforeDestroyed for app scope
-            beanManager().getEvent().select(ContainerBeforeShutdown.class, BeforeDestroyed.Literal.APPLICATION).fire(new ContainerBeforeShutdown(id));
+            beanManager().getEvent().select(ContainerBeforeShutdown.class, BeforeDestroyed.Literal.APPLICATION)
+                    .fire(new ContainerBeforeShutdown(id));
         } finally {
             discard(id);
             // Destroy all the dependent beans correctly
             creationalContext.release();
-            beanManager().getEvent().select(ContainerShutdown.class, Destroyed.Literal.APPLICATION).fire(new ContainerShutdown(id));
+            beanManager().getEvent().select(ContainerShutdown.class, Destroyed.Literal.APPLICATION)
+                    .fire(new ContainerShutdown(id));
             bootstrap.shutdown();
             WeldSELogger.LOG.weldContainerShutdown(id);
         }
@@ -321,7 +327,8 @@ public synchronized void shutdown() {
 
     /**
      *
-     * @return true if the container was initialized completely and is not shut down yet, false otherwise
+     * @return true if the container was initialized completely and is not shut down yet, false
+     *         otherwise
      */
     public boolean isRunning() {
         return SINGLETON.isSet(id) && instance != null;
@@ -379,7 +386,8 @@ private void checkDeploymentValidated() {
     private void checkIsRunning() {
         if (!SINGLETON.isSet(id)) {
             if (WeldSELogger.LOG.isTraceEnabled()) {
-                WeldSELogger.LOG.tracev("Spurious call to shutdown from: {0}", (Object[]) Thread.currentThread().getStackTrace());
+                WeldSELogger.LOG.tracev("Spurious call to shutdown from: {0}",
+                        (Object[]) Thread.currentThread().getStackTrace());
             }
             throw WeldSELogger.LOG.weldContainerAlreadyShutDown(id);
         }
@@ -389,7 +397,8 @@ private BeanManagerImpl beanManager() {
         if (beanManager == null) {
             synchronized (this) {
                 if (beanManager == null) {
-                    beanManager = BeanManagerProxy.unwrap(bootstrap.getManager(getDeterminingBeanDeploymentArchive(deployment)));
+                    beanManager = BeanManagerProxy
+                            .unwrap(bootstrap.getManager(getDeterminingBeanDeploymentArchive(deployment)));
                 }
             }
         }
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java
index f82e6ad6596..e18097ad64c 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java
@@ -47,8 +47,10 @@ public void registerWeldSEBeans(@Observes BeforeBeanDiscovery event, BeanManager
         if (ignoreEvent(event)) {
             return;
         }
-        event.addAnnotatedType(VetoedSuppressedAnnotatedType.from(ParametersFactory.class, manager), ParametersFactory.class.getName());
-        event.addAnnotatedType(VetoedSuppressedAnnotatedType.from(RunnableDecorator.class, manager), RunnableDecorator.class.getName());
+        event.addAnnotatedType(VetoedSuppressedAnnotatedType.from(ParametersFactory.class, manager),
+                ParametersFactory.class.getName());
+        event.addAnnotatedType(VetoedSuppressedAnnotatedType.from(RunnableDecorator.class, manager),
+                RunnableDecorator.class.getName());
         event.addAnnotatedType(VetoedSuppressedAnnotatedType.from(ActivateThreadScopeInterceptor.class, manager),
                 ActivateThreadScopeInterceptor.class.getName());
     }
@@ -69,7 +71,8 @@ public void registerWeldSEContexts(@Observes AfterBeanDiscovery event, BeanManag
     }
 
     /**
-     * Returns true if the specified event is not an instance of {@link AbstractContainerEvent}, i.e. was thrown by other CDI implementation than Weld.
+     * Returns true if the specified event is not an instance of {@link AbstractContainerEvent}, i.e. was thrown by
+     * other CDI implementation than Weld.
      */
     private static boolean ignoreEvent(Object event) {
         return !(event instanceof AbstractContainerEvent);
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/beans/ParametersFactory.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/beans/ParametersFactory.java
index 116e7971583..ddc88512cb5 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/beans/ParametersFactory.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/beans/ParametersFactory.java
@@ -71,11 +71,11 @@ public String[] getArgsAsArray() {
      * StartMain passes in the command line args here.
      *
      * @param args The command line arguments. If null is given then an empty
-     *             array will be used instead.
+     *        array will be used instead.
      */
     public void setArgs(String[] args) {
         if (args == null) {
-            args = new String[]{};
+            args = new String[] {};
         }
         this.args = args;
         this.argsList = Collections.unmodifiableList(new ArrayList(Arrays.asList(args)));
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/Parameters.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/Parameters.java
index 159a0e0d86b..bfe8b7e58d3 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/Parameters.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/Parameters.java
@@ -16,21 +16,22 @@
  */
 package org.jboss.weld.environment.se.bindings;
 
-import jakarta.inject.Qualifier;
-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.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;
+
 /**
  * @author Peter Royle
  */
 @Qualifier
 @Retention(RUNTIME)
-@Target({PARAMETER, METHOD, FIELD, TYPE})
+@Target({ PARAMETER, METHOD, FIELD, TYPE })
 public @interface Parameters {
 }
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/package-info.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/package-info.java
index 6c29e462a02..28714a42e8b 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/package-info.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/bindings/package-info.java
@@ -16,5 +16,5 @@
  */
 @Vetoed
 package org.jboss.weld.environment.se.bindings;
-import jakarta.enterprise.inject.Vetoed;
 
+import jakarta.enterprise.inject.Vetoed;
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/ThreadScoped.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/ThreadScoped.java
index 934279d1322..fa17ea8d733 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/ThreadScoped.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/ThreadScoped.java
@@ -16,23 +16,24 @@
 */
 package org.jboss.weld.environment.se.contexts;
 
-import jakarta.enterprise.context.NormalScope;
+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.Inherited;
 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 jakarta.enterprise.context.NormalScope;
 
 /**
  * Used to represent that a managed bean is scoped to the current thread.
  *
  * @author Peter Royle
  */
-@Target({TYPE, METHOD, FIELD})
+@Target({ TYPE, METHOD, FIELD })
 @Retention(RUNTIME)
 @Documented
 @NormalScope
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/package-info.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/package-info.java
index 4f1a6c4f790..3371a588ca4 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/package-info.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/contexts/package-info.java
@@ -16,5 +16,5 @@
  */
 @Vetoed
 package org.jboss.weld.environment.se.contexts;
-import jakarta.enterprise.inject.Vetoed;
 
+import jakarta.enterprise.inject.Vetoed;
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/ContainerInitialized.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/ContainerInitialized.java
index 8d4502ab4d6..093c8ac4d4f 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/ContainerInitialized.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/ContainerInitialized.java
@@ -19,7 +19,8 @@
 import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
 
 /**
- * The event that is fired when the Weld CDI container is initialized and ready for applications to take control, which it may do by observing this event.
+ * The event that is fired when the Weld CDI container is initialized and ready for applications to take control, which it may
+ * do by observing this event.
  *
  * @author Peter Royle
  */
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/package-info.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/package-info.java
index ca050bd1035..d93603a1aa1 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/package-info.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/events/package-info.java
@@ -16,5 +16,5 @@
  */
 @Vetoed
 package org.jboss.weld.environment.se.events;
-import jakarta.enterprise.inject.Vetoed;
 
+import jakarta.enterprise.inject.Vetoed;
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/WeldSELogger.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/WeldSELogger.java
index 0f7ed4cb09a..5a7bd55226c 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/WeldSELogger.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/WeldSELogger.java
@@ -11,7 +11,8 @@
 import org.jboss.weld.exceptions.IllegalArgumentException;
 
 /**
- * A source of localized log/bundle messages and exceptions. Note that this interface extends {@link WeldEnvironmentLogger} so that regular logger methods are
+ * A source of localized log/bundle messages and exceptions. Note that this interface extends {@link WeldEnvironmentLogger} so
+ * that regular logger methods are
  * available.
  *
  * Message IDs: 002000 - 002099
@@ -86,7 +87,8 @@ public interface WeldSELogger extends WeldEnvironmentLogger {
     IllegalArgumentException unexpectedValueForAdditionalBeanDefiningAnnotations(Class clazz);
 
     @LogMessage(level = Level.WARN)
-    @Message(id = 2018, value = "Skipping registration of additional bean defining annotation via `org.jboss.weld.se.additionalBeanDefiningAnnotations`. " +
+    @Message(id = 2018, value = "Skipping registration of additional bean defining annotation via `org.jboss.weld.se.additionalBeanDefiningAnnotations`. "
+            +
             "Only values of type Class are valid. Found: {0}", format = Format.MESSAGE_FORMAT)
     void unexpectedItemsInValueCollection(Class clazz);
 
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/package-info.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/package-info.java
index 65ab708f8cb..b92ad85d4cc 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/package-info.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/logging/package-info.java
@@ -16,5 +16,5 @@
  */
 @Vetoed
 package org.jboss.weld.environment.se.logging;
-import jakarta.enterprise.inject.Vetoed;
 
+import jakarta.enterprise.inject.Vetoed;
diff --git a/environments/se/core/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java b/environments/se/core/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java
index 409d39334c2..d473b373799 100644
--- a/environments/se/core/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java
+++ b/environments/se/core/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java
@@ -44,8 +44,6 @@ public RunnableDecorator(WeldSEBeanRegistrant extension) {
         this.threadContext = extension.getThreadContext();
     }
 
-
-
     /**
      * Set up the ThreadContext and delegate.
      */
@@ -62,5 +60,4 @@ public void run() {
 
     }
 
-
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java
index abeb7ebe93a..a9fa29b5e3e 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java
@@ -33,7 +33,7 @@
  */
 public class StartMainTest {
 
-    private static String[] ARGS = new String[]{"arg1", "arg2", "arg3"};
+    private static String[] ARGS = new String[] { "arg1", "arg2", "arg3" };
 
     private StartMain startMain;
 
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryInjectionTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryInjectionTest.java
index 1d97019a5cf..5fe5c49433f 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryInjectionTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryInjectionTest.java
@@ -42,11 +42,14 @@ public class BeanDiscoveryInjectionTest {
 
     @Deployment
     public static Archive getDeployment() {
-        JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml")
+        JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class)
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml")
                 .addClasses(Dog.class, Cat.class, Cow.class);
-        JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED), "beans.xml")
+        JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED), "beans.xml")
                 .addClasses(Plant.class, Tree.class, Stone.class);
-        JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE), "beans.xml")
+        JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE), "beans.xml")
                 .addClasses(Flat.class, House.class);
         return ShrinkWrap.create(WeldSEClassPath.class).add(archive01, archive02, archive03);
     }
@@ -64,7 +67,7 @@ public void testAnnotatedBeanDiscovery(BeanManagerImpl manager) {
         assertEquals(1, manager.getBeans(Plant.class).size());
         assertEquals(0, manager.getBeans(Stone.class).size());
         for (BeanDeploymentArchive beanDeploymentArchive : Container.instance(manager).beanDeploymentArchives().keySet()) {
-            if(beanDeploymentArchive.getBeanClasses().contains(Plant.class.getName())) {
+            if (beanDeploymentArchive.getBeanClasses().contains(Plant.class.getName())) {
                 assertFalse(beanDeploymentArchive.getBeanClasses().contains(Stone.class.getName()));
                 assertTrue(beanDeploymentArchive.getKnownClasses().contains(Stone.class.getName()));
             }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithJandexIndexTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithJandexIndexTest.java
index 521a9566328..88799754ff2 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithJandexIndexTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithJandexIndexTest.java
@@ -53,18 +53,21 @@ public static Archive getDeployment() {
                 .addClasses(Dog.class, Cat.class, Cow.class);
         archives.add(archive01);
 
-        JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED), "beans.xml")
+        JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED), "beans.xml")
                 .addClasses(Plant.class, Tree.class, Stone.class);
         archive02.addAsManifestResource(createJandexIndexAsset(archive02), "jandex.idx");
         archives.add(archive02);
 
-        JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml")
+        JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml")
                 .addClasses(Flat.class, House.class, Apartment.class);
         archive03.addAsManifestResource(createJandexIndexAsset(archive03), "jandex.idx");
         archives.add(archive03);
 
         // Archive without index
-        JavaArchive archive04 = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml")
+        JavaArchive archive04 = ShrinkWrap.create(BeanArchive.class)
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL), "beans.xml")
                 .addClasses(Hat.class);
         archives.add(archive04);
 
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithoutIsolationTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithoutIsolationTest.java
index acfa89f3089..cc175eca9fd 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithoutIsolationTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/BeanDiscoveryWithoutIsolationTest.java
@@ -21,8 +21,8 @@
 public class BeanDiscoveryWithoutIsolationTest {
     @Deployment
     public static Archive getDeployment() {
-		oldArchiveIsolationProperty = System.getProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY);
-		System.setProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY, "false");
+        oldArchiveIsolationProperty = System.getProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY);
+        System.setProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY, "false");
 
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
         JavaArchive archive = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
@@ -31,19 +31,18 @@ public static Archive getDeployment() {
         return archives;
     }
 
-	private static String oldArchiveIsolationProperty;
-
-	@AfterClass
-	public static void destroy() {
-		if (oldArchiveIsolationProperty == null) {
-			System.clearProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY);
-		}
-		else {
-			System.setProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY, oldArchiveIsolationProperty);
-			oldArchiveIsolationProperty = null;
-		}
-	}
-	
+    private static String oldArchiveIsolationProperty;
+
+    @AfterClass
+    public static void destroy() {
+        if (oldArchiveIsolationProperty == null) {
+            System.clearProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY);
+        } else {
+            System.setProperty(Weld.ARCHIVE_ISOLATION_SYSTEM_PROPERTY, oldArchiveIsolationProperty);
+            oldArchiveIsolationProperty = null;
+        }
+    }
+
     /**
      * Test bean discovery in SE with an empty beans XML.
      */
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/Dog.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/Dog.java
index d9551090275..31c359da01f 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/Dog.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/Dog.java
@@ -17,6 +17,7 @@
 package org.jboss.weld.environment.se.test.beandiscovery;
 
 import jakarta.enterprise.context.Dependent;
+
 import org.jboss.weld.environment.se.test.beandiscovery.interceptors.InterceptorBindingAnnotation;
 
 @InterceptorBindingAnnotation
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/alternatives/BeanDiscoveryAlternativeTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/alternatives/BeanDiscoveryAlternativeTest.java
index 0a6a6e18bc2..457f8654fc7 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/alternatives/BeanDiscoveryAlternativeTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/alternatives/BeanDiscoveryAlternativeTest.java
@@ -49,10 +49,12 @@ public class BeanDiscoveryAlternativeTest {
     @Deployment
     public static Archive getDeployment() {
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
-        JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).alternatives(AlternativeDog.class), "beans.xml")
+        JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class)
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).alternatives(AlternativeDog.class), "beans.xml")
                 .addClasses(Dog.class, AlternativeDog.class, DogInterface.class, Cat.class);
         JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).alternatives(AlternativeTree.class), "beans.xml")
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).alternatives(AlternativeTree.class),
+                        "beans.xml")
                 .addClasses(Tree.class, AlternativeTree.class, Plant.class, Stone.class, AlternativeStone.class);
         JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
                 .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE).alternatives(AlternativeFlat.class), "beans.xml")
@@ -65,7 +67,8 @@ public static Archive getDeployment() {
     }
 
     /**
-     * Test alternatives for all the bean discovery modes in SE. Need to inject the representatives to get the bean manager of the bean archive.
+     * Test alternatives for all the bean discovery modes in SE. Need to inject the representatives to get the bean manager of
+     * the bean archive.
      */
     @Test
     public void testAllBeanDiscoveryAlternative(Cat representative) {
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator02Test.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator02Test.java
index b4f51ba5fbf..80e9bdbccd7 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator02Test.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator02Test.java
@@ -35,16 +35,25 @@ public static Archive getDeployment() {
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
         JavaArchive archive01 = ShrinkWrap
                 .create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
-                        "beans.xml").addClasses(Dog.class, Cat.class, ClassicRepresentDecorator.class, ScopedRepresentDecorator.class);
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ALL).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
+                        "beans.xml")
+                .addClasses(Dog.class, Cat.class, ClassicRepresentDecorator.class, ScopedRepresentDecorator.class);
         JavaArchive archive02 = ShrinkWrap
                 .create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
-                        "beans.xml").addClasses(Plant.class, Tree.class, Stone.class);
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
+                        "beans.xml")
+                .addClasses(Plant.class, Tree.class, Stone.class);
         JavaArchive archive03 = ShrinkWrap
                 .create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
-                        "beans.xml").addClasses(Flat.class, House.class);
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.NONE).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
+                        "beans.xml")
+                .addClasses(Flat.class, House.class);
         archives.add(archive01);
         archives.add(archive02);
         archives.add(archive03);
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator03Test.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator03Test.java
index aa63882685d..3a2cdb46d1a 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator03Test.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecorator03Test.java
@@ -41,24 +41,31 @@
 public class BeanDiscoveryDecorator03Test {
 
     /**
-     * Throw exception because of the decorator ClassicRepresentDecorator not discovered, because it has not a bean defining annotation.
+     * Throw exception because of the decorator ClassicRepresentDecorator not discovered, because it has not a bean defining
+     * annotation.
      */
     @Deployment
     @ShouldThrowException(DeploymentException.class)
     public static Archive getDeployment() {
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
         JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ALL).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
                         "beans.xml")
-                        .addClasses(Dog.class, Cat.class);
+                .addClasses(Dog.class, Cat.class);
         JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
                         "beans.xml")
-                        .addClasses(Plant.class, Tree.class, Stone.class, ScopedRepresentDecorator.class);
+                .addClasses(Plant.class, Tree.class, Stone.class, ScopedRepresentDecorator.class);
         JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.NONE).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
                         "beans.xml")
-                        .addClasses(Flat.class, House.class, ClassicRepresentDecorator.class);
+                .addClasses(Flat.class, House.class, ClassicRepresentDecorator.class);
         archives.add(archive01);
         archives.add(archive02);
         archives.add(archive03);
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecoratorTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecoratorTest.java
index ee6dbc5c5bc..856206e8987 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecoratorTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/decorators/BeanDiscoveryDecoratorTest.java
@@ -44,17 +44,23 @@ public class BeanDiscoveryDecoratorTest {
     public static Archive getDeployment() {
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
         JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ALL).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
                         "beans.xml")
-                        .addClasses(Dog.class, Cat.class, ClassicRepresentDecorator.class, ScopedRepresentDecorator.class);
+                .addClasses(Dog.class, Cat.class, ClassicRepresentDecorator.class, ScopedRepresentDecorator.class);
         JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
                         "beans.xml")
-                        .addClasses(Plant.class, Tree.class, Stone.class);
+                .addClasses(Plant.class, Tree.class, Stone.class);
         JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE).decorators(ClassicRepresentDecorator.class, ScopedRepresentDecorator.class),
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.NONE).decorators(ClassicRepresentDecorator.class,
+                                ScopedRepresentDecorator.class),
                         "beans.xml")
-                        .addClasses(Flat.class, House.class);
+                .addClasses(Flat.class, House.class);
         archives.add(archive01);
         archives.add(archive02);
         archives.add(archive03);
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor02Test.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor02Test.java
index 419ed990bdc..5a34f247a68 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor02Test.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor02Test.java
@@ -34,13 +34,19 @@ public boolean isArchiveIsolationEnabled() {
     public static Archive getDeployment() {
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
         JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
-                .addClasses(Dog.class, Cat.class, ClassicInterceptor.class, ScopedInterceptor.class, InterceptorBindingAnnotation.class);
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ALL).interceptors(ScopedInterceptor.class, ClassicInterceptor.class),
+                        "beans.xml")
+                .addClasses(Dog.class, Cat.class, ClassicInterceptor.class, ScopedInterceptor.class,
+                        InterceptorBindingAnnotation.class);
         JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).interceptors(ScopedInterceptor.class,
+                        ClassicInterceptor.class), "beans.xml")
                 .addClasses(Plant.class, Tree.class, Stone.class);
         JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.NONE).interceptors(ScopedInterceptor.class, ClassicInterceptor.class),
+                        "beans.xml")
                 .addClasses(Flat.class, House.class);
         archives.add(archive01);
         archives.add(archive02);
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor03Test.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor03Test.java
index fee12bc783c..c39ae27ab9e 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor03Test.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptor03Test.java
@@ -48,13 +48,18 @@ public class BeanDiscoveryInterceptor03Test {
     public static Archive getDeployment() {
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
         JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ALL).interceptors(ScopedInterceptor.class, ClassicInterceptor.class),
+                        "beans.xml")
                 .addClasses(Dog.class, Cat.class, InterceptorBindingAnnotation.class);
         JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).interceptors(ScopedInterceptor.class,
+                        ClassicInterceptor.class), "beans.xml")
                 .addClasses(Plant.class, Tree.class, Stone.class, ScopedInterceptor.class);
         JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.NONE).interceptors(ScopedInterceptor.class, ClassicInterceptor.class),
+                        "beans.xml")
                 .addClasses(Flat.class, House.class, ClassicInterceptor.class);
         archives.add(archive01);
         archives.add(archive02);
@@ -66,5 +71,4 @@ public static Archive getDeployment() {
     public void testAllBeanDiscovery() {
     }
 
-
 }
\ No newline at end of file
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptorTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptorTest.java
index 9df5a4288d6..7dcdc1ce235 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptorTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/BeanDiscoveryInterceptorTest.java
@@ -44,13 +44,19 @@ public class BeanDiscoveryInterceptorTest {
     public static Archive getDeployment() {
         WeldSEClassPath archives = ShrinkWrap.create(WeldSEClassPath.class);
         JavaArchive archive01 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ALL).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
-                .addClasses(Dog.class, Cat.class, ClassicInterceptor.class, ScopedInterceptor.class, InterceptorBindingAnnotation.class);
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.ALL).interceptors(ScopedInterceptor.class, ClassicInterceptor.class),
+                        "beans.xml")
+                .addClasses(Dog.class, Cat.class, ClassicInterceptor.class, ScopedInterceptor.class,
+                        InterceptorBindingAnnotation.class);
         JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).interceptors(ScopedInterceptor.class,
+                        ClassicInterceptor.class), "beans.xml")
                 .addClasses(Plant.class, Tree.class, Stone.class);
         JavaArchive archive03 = ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE).interceptors(ScopedInterceptor.class, ClassicInterceptor.class), "beans.xml")
+                .addAsManifestResource(
+                        new BeansXml(BeanDiscoveryMode.NONE).interceptors(ScopedInterceptor.class, ClassicInterceptor.class),
+                        "beans.xml")
                 .addClasses(Flat.class, House.class);
         archives.add(archive01);
         archives.add(archive02);
@@ -58,7 +64,6 @@ public static Archive getDeployment() {
         return archives;
     }
 
-
     /**
      * Test bean discovery in SE.
      */
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/ScopedInterceptor.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/ScopedInterceptor.java
index bcf5a646f01..4ed825e6c6e 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/ScopedInterceptor.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/interceptors/ScopedInterceptor.java
@@ -26,6 +26,7 @@
 @Dependent
 public class ScopedInterceptor {
     public static int called = 0;
+
     @AroundInvoke
     public Object saveMethodEntry(InvocationContext invocationContext) throws Exception {
         called++;
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/DisabledIsolationPriorityTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/DisabledIsolationPriorityTest.java
index 1c7b415ad87..9402e5ebe8d 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/DisabledIsolationPriorityTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/DisabledIsolationPriorityTest.java
@@ -24,5 +24,5 @@ public class DisabledIsolationPriorityTest extends PriorityTest {
     public boolean isArchiveIsolationEnabled() {
         return false;
     }
-    
+
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/Normalized.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/Normalized.java
index 73757fda464..947187b9aaa 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/Normalized.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/Normalized.java
@@ -1,16 +1,18 @@
 package org.jboss.weld.environment.se.test.beandiscovery.priority;
 
-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.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import jakarta.interceptor.InterceptorBinding;
 
 @Inherited
 @InterceptorBinding
 @Retention(RUNTIME)
-@Target({METHOD, TYPE})
+@Target({ METHOD, TYPE })
 public @interface Normalized {
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/SoundSource.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/SoundSource.java
index 58ad1fe8cfe..a91404d4edb 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/SoundSource.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beandiscovery/priority/SoundSource.java
@@ -1,6 +1,6 @@
 package org.jboss.weld.environment.se.test.beandiscovery.priority;
 
 public interface SoundSource {
-    
+
     public String generateSound();
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/InitObserverTestBean.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/InitObserverTestBean.java
index 99c55d04517..e0f83a9c636 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/InitObserverTestBean.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/InitObserverTestBean.java
@@ -16,11 +16,11 @@
  */
 package org.jboss.weld.environment.se.test.beans;
 
-import org.jboss.weld.environment.se.events.ContainerInitialized;
-
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
 
+import org.jboss.weld.environment.se.events.ContainerInitialized;
+
 /**
  * Tests the observing of both built-in and application-specific events.
  *
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/ParametersTestBean.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/ParametersTestBean.java
index 35b7b7b02a3..648feba6827 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/ParametersTestBean.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/ParametersTestBean.java
@@ -17,14 +17,15 @@
 
 package org.jboss.weld.environment.se.test.beans;
 
-import org.jboss.weld.environment.se.bindings.Parameters;
+import static org.junit.Assert.assertNotNull;
 
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
 import java.io.Serializable;
 import java.util.List;
 
-import static org.junit.Assert.assertNotNull;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+import org.jboss.weld.environment.se.bindings.Parameters;
 
 /**
  * @author Peter Royle
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/AbstractThreadContextTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/AbstractThreadContextTest.java
index 08157a7da3b..5e742ebe271 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/AbstractThreadContextTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/AbstractThreadContextTest.java
@@ -64,5 +64,4 @@ public void testThreadContext(Instance instance) {
         }
     }
 
-
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadContextImplicitBeanArchiveTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadContextImplicitBeanArchiveTest.java
index 5f79b27bd51..5853eff13a2 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadContextImplicitBeanArchiveTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadContextImplicitBeanArchiveTest.java
@@ -36,7 +36,8 @@ public class ThreadContextImplicitBeanArchiveTest extends AbstractThreadContextT
     @Deployment
     public static Archive getDeployment() {
         return ShrinkWrap.create(BeanArchive.class)
-                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(RunnableDecorator.class), "beans.xml")
+                .addAsManifestResource(new BeansXml(BeanDiscoveryMode.ANNOTATED).decorators(RunnableDecorator.class),
+                        "beans.xml")
                 .addClasses(Counter.class, SingletonCounter.class, ThreadCounter.class, ThreadRunner.class);
     }
 
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/BuilderInterceptorBinding.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/BuilderInterceptorBinding.java
index 7967103293e..d67c60f3210 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/BuilderInterceptorBinding.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/BuilderInterceptorBinding.java
@@ -33,7 +33,8 @@
 @Retention(RUNTIME)
 public @interface BuilderInterceptorBinding {
 
-    public static class BuilderInterceptorBindingLiteral extends AnnotationLiteral implements BuilderInterceptorBinding {
+    public static class BuilderInterceptorBindingLiteral extends AnnotationLiteral
+            implements BuilderInterceptorBinding {
 
     }
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/Juicy.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/Juicy.java
index cc652158334..0fec8b20587 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/Juicy.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/Juicy.java
@@ -9,7 +9,7 @@
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
+ * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/WeldBuilderTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/WeldBuilderTest.java
index df6584aea8d..fc0ac3f3171 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/WeldBuilderTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/WeldBuilderTest.java
@@ -70,16 +70,19 @@ public void testSyntheticBeanArchive() throws Exception {
             assertEquals(5, container.select(Cat.class).get().getVal());
         }
         // Test interceptor enabled for the synthetic BDA
-        try (WeldContainer container = weld.reset().beanClasses(Qux.class, MonitoringInterceptor.class).interceptors(MonitoringInterceptor.class)
+        try (WeldContainer container = weld.reset().beanClasses(Qux.class, MonitoringInterceptor.class)
+                .interceptors(MonitoringInterceptor.class)
                 .initialize()) {
             assertEquals(Integer.valueOf(11), container.select(Qux.class).get().ping());
         }
         // Test decorator enabled for the synthetic BDA
-        try (WeldContainer container = weld.reset().beanClasses(Foo.class, CoolDecorator.class).decorators(CoolDecorator.class).initialize()) {
+        try (WeldContainer container = weld.reset().beanClasses(Foo.class, CoolDecorator.class).decorators(CoolDecorator.class)
+                .initialize()) {
             assertEquals("NOK", container.select(Foo.class).get().methodToBeDecorated());
         }
         // Test addBeanClass()
-        try (WeldContainer container = weld.reset().beanClasses(Bar.class).addBeanClass(Foo.class).alternatives(Bar.class).initialize()) {
+        try (WeldContainer container = weld.reset().beanClasses(Bar.class).addBeanClass(Foo.class).alternatives(Bar.class)
+                .initialize()) {
             assertEquals(10, container.select(Foo.class).get().getVal());
             assertEquals(1, container.select(Bar.class).get().getVal());
             assertTrue(container.select(Baz.class).isUnsatisfied());
@@ -113,7 +116,8 @@ public void testMultipleWeldInstancesCreated() {
 
     @Test
     public void testConfigurationProperties() {
-        try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Foo.class).property(ConfigurationKey.CONCURRENT_DEPLOYMENT.get(), false)
+        try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Foo.class)
+                .property(ConfigurationKey.CONCURRENT_DEPLOYMENT.get(), false)
                 .initialize()) {
             assertFalse(container.select(BeanManagerImpl.class).get().getServices().get(WeldConfiguration.class)
                     .getBooleanProperty(ConfigurationKey.CONCURRENT_DEPLOYMENT));
@@ -122,7 +126,8 @@ public void testConfigurationProperties() {
 
     @Test
     public void testReset() {
-        Weld weld = new Weld().containerId("FOO").disableDiscovery().property(ConfigurationKey.BEAN_IDENTIFIER_INDEX_OPTIMIZATION.get(), true)
+        Weld weld = new Weld().containerId("FOO").disableDiscovery()
+                .property(ConfigurationKey.BEAN_IDENTIFIER_INDEX_OPTIMIZATION.get(), true)
                 .beanClasses(Foo.class);
         weld.reset();
         assertFalse(weld.isDiscoveryEnabled());
@@ -136,7 +141,8 @@ public void testReset() {
 
     @Test
     public void testResetAll() {
-        Weld weld = new Weld().containerId("FOO").disableDiscovery().property(ConfigurationKey.RELAXED_CONSTRUCTION.get(), false).beanClasses(Foo.class);
+        Weld weld = new Weld().containerId("FOO").disableDiscovery()
+                .property(ConfigurationKey.RELAXED_CONSTRUCTION.get(), false).beanClasses(Foo.class);
         weld.resetAll();
         assertTrue(weld.isDiscoveryEnabled());
         assertNull(weld.getContainerId());
@@ -186,14 +192,16 @@ public void testSyntheticBeanArchivePackages() throws Exception {
             assertEquals(22, container.select(Beta2.class).get().getVal());
         }
         // Scan the package from cdi-api.jar, use discovery mode ALL
-        try (WeldContainer container = weld.reset().packages(ObserverException.class).setBeanDiscoveryMode(BeanDiscoveryMode.ALL).initialize()) {
+        try (WeldContainer container = weld.reset().packages(ObserverException.class)
+                .setBeanDiscoveryMode(BeanDiscoveryMode.ALL).initialize()) {
             assertFalse(container.select(ObserverException.class).isUnsatisfied());
         }
         // Scan the package recursively from cdi-api.jar
         try (WeldContainer container = weld.reset().addPackage(true, Any.class).initialize()) {
             // There is no managed bean discovered, therefore we only check that the bean class was found
             boolean found = false;
-            for (BeanDeploymentArchive beanDeploymentArchive : Container.instance(container.getId()).beanDeploymentArchives().keySet()) {
+            for (BeanDeploymentArchive beanDeploymentArchive : Container.instance(container.getId()).beanDeploymentArchives()
+                    .keySet()) {
                 if (beanDeploymentArchive.getBeanClasses().contains(DefinitionException.class.getName())) {
                     found = true;
                     break;
@@ -205,7 +213,8 @@ public void testSyntheticBeanArchivePackages() throws Exception {
 
     @Test
     public void testExtensions() {
-        try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Bar.class).extensions(new TestExtension()).initialize()) {
+        try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Bar.class).extensions(new TestExtension())
+                .initialize()) {
             assertEquals(10, container.select(Foo.class).get().getVal());
             assertFalse(container.select(TestExtension.class).isUnsatisfied());
         }
@@ -227,7 +236,8 @@ public void testAccessibility() {
     public void testBeanBuilder() {
         try (WeldContainer container = new Weld().disableDiscovery()
                 .addContainerLifecycleObserver(
-                        afterBeanDiscovery((e) -> e.addBean().addType(Integer.class).produceWith((i) -> 42).addQualifier(Juicy.Literal.INSTANCE)))
+                        afterBeanDiscovery((e) -> e.addBean().addType(Integer.class).produceWith((i) -> 42)
+                                .addQualifier(Juicy.Literal.INSTANCE)))
                 .initialize()) {
             assertEquals(Integer.valueOf(42), container.select(Integer.class, Juicy.Literal.INSTANCE).get());
         }
@@ -237,7 +247,8 @@ public void testBeanBuilder() {
     public void testInterceptorBuilder() {
         try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Coorge.class, BuilderInterceptorBinding.class)
                 .addContainerLifecycleObserver(ContainerLifecycleObserver
-                        .afterBeanDiscovery((e) -> e.addInterceptor().addBinding(new BuilderInterceptorBinding.BuilderInterceptorBindingLiteral())
+                        .afterBeanDiscovery((e) -> e.addInterceptor()
+                                .addBinding(new BuilderInterceptorBinding.BuilderInterceptorBindingLiteral())
                                 .priority(2500).intercept(InterceptionType.AROUND_INVOKE, invocationContext -> {
                                     try {
                                         Integer result = ((Integer) invocationContext.proceed());
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/containerlifecycle/ContainerLifecyleObserverTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/containerlifecycle/ContainerLifecyleObserverTest.java
index 061f2d9448f..780927ef154 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/containerlifecycle/ContainerLifecyleObserverTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/containerlifecycle/ContainerLifecyleObserverTest.java
@@ -76,14 +76,16 @@ public void testExtensionBuilder() {
         ActionSequence.reset();
 
         Extension myExtension = ContainerLifecycleObserver.extensionBuilder()
-                .add(beforeBeanDiscovery((e) -> addAction(BeforeBeanDiscovery.class.getSimpleName()))).add(afterTypeDiscovery().notify((e, b) -> {
+                .add(beforeBeanDiscovery((e) -> addAction(BeforeBeanDiscovery.class.getSimpleName())))
+                .add(afterTypeDiscovery().notify((e, b) -> {
                     addAction(AfterTypeDiscovery.class.getSimpleName());
                     e.addAnnotatedType(b.createAnnotatedType(Charlie.class), Charlie.class.getName());
                 })).add(afterBeanDiscovery((e) -> {
                     addAction(AfterBeanDiscovery.class.getSimpleName());
                     e.addObserverMethod().beanClass(Foo.class).observedType(Foo.class).notifyWith((ctx) -> {
                     });
-                    e.addBean().beanClass(Integer.class).addType(Integer.class).addQualifier(Juicy.Literal.INSTANCE).createWith((ctx) -> Integer.valueOf(10));
+                    e.addBean().beanClass(Integer.class).addType(Integer.class).addQualifier(Juicy.Literal.INSTANCE)
+                            .createWith((ctx) -> Integer.valueOf(10));
                 })).add(afterDeploymentValidation((e) -> addAction(AfterDeploymentValidation.class.getSimpleName())))
                 .add(beforeShutdown((e) -> addAction(BeforeShutdown.class.getSimpleName()))).build();
 
@@ -96,33 +98,42 @@ public void testExtensionBuilder() {
                 .add(processProducer().notify((e) -> addAction(ProcessProducer.class.getSimpleName())))
                 .add(processBean().notify((e) -> addAction(ProcessBean.class.getSimpleName())))
                 .add(processManagedBean().notify((e) -> addAction(ProcessManagedBean.class.getSimpleName())))
-                .add(processProducerField().notify((e) -> addAction(ProcessProducerField.class.getSimpleName()))).add(processProducerMethod().notify((e) -> {
+                .add(processProducerField().notify((e) -> addAction(ProcessProducerField.class.getSimpleName())))
+                .add(processProducerMethod().notify((e) -> {
                     // Weld SE defines some producer methods, e.g. ParametersFactory
                     addAction(ProcessProducerMethod.class.getSimpleName());
                 })).add(processBeanAttributes().notify((e) -> addAction(ProcessBeanAttributes.class.getSimpleName())))
                 .add(processObserverMethod().notify((e) -> addAction(ProcessObserverMethod.class.getSimpleName())))
                 .add(processObserverMethod(new TypeLiteral>() {
-                }.getType()).notify((e) -> addAction(ProcessObserverMethod.class.getSimpleName() + String.class.getSimpleName())))
+                }.getType())
+                        .notify((e) -> addAction(ProcessObserverMethod.class.getSimpleName() + String.class.getSimpleName())))
                 .add(processSyntheticObserverMethod(new TypeLiteral>() {
-                }.getType()).notify((e) -> addAction(ProcessSyntheticObserverMethod.class.getSimpleName() + Foo.class.getSimpleName())))
+                }.getType()).notify(
+                        (e) -> addAction(ProcessSyntheticObserverMethod.class.getSimpleName() + Foo.class.getSimpleName())))
                 .add(processSyntheticBean(new TypeLiteral>() {
-                }.getType()).notify((e) -> addAction(ProcessSyntheticBean.class.getSimpleName() + Integer.class.getSimpleName()))).build();
+                }.getType())
+                        .notify((e) -> addAction(ProcessSyntheticBean.class.getSimpleName() + Integer.class.getSimpleName())))
+                .build();
 
-        try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Foo.class, Bravo.class).addExtension(myExtension).addExtension(myExtension2)
+        try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Foo.class, Bravo.class)
+                .addExtension(myExtension).addExtension(myExtension2)
                 .initialize()) {
             assertTrue(container.select(Foo.class).isUnsatisfied());
             assertFalse(container.select(Bravo.class).isUnsatisfied());
             Assert.assertEquals(Integer.valueOf(10), container.select(Integer.class, Juicy.Literal.INSTANCE).get());
         }
 
-        ActionSequence.assertSequenceDataContainsAll(BeforeBeanDiscovery.class, AfterTypeDiscovery.class, AfterBeanDiscovery.class,
+        ActionSequence.assertSequenceDataContainsAll(BeforeBeanDiscovery.class, AfterTypeDiscovery.class,
+                AfterBeanDiscovery.class,
                 AfterDeploymentValidation.class, BeforeShutdown.class);
-        ActionSequence.assertSequenceDataContainsAll(ProcessBeanAttributes.class, ProcessSyntheticAnnotatedType.class, ProcessInjectionPoint.class,
+        ActionSequence.assertSequenceDataContainsAll(ProcessBeanAttributes.class, ProcessSyntheticAnnotatedType.class,
+                ProcessInjectionPoint.class,
                 ProcessObserverMethod.class, ProcessBeanAttributes.class, ProcessProducer.class);
         ActionSequence.assertSequenceDataContainsAll(ProcessObserverMethod.class.getSimpleName() + String.class.getSimpleName(),
                 ProcessSyntheticObserverMethod.class.getSimpleName() + Foo.class.getSimpleName(),
                 ProcessSyntheticBean.class.getSimpleName() + Integer.class.getSimpleName());
-        ActionSequence.assertSequenceDataContainsAll(ProcessBean.class, ProcessManagedBean.class, ProcessProducerMethod.class, ProcessProducerField.class);
+        ActionSequence.assertSequenceDataContainsAll(ProcessBean.class, ProcessManagedBean.class, ProcessProducerMethod.class,
+                ProcessProducerField.class);
 
     }
 
@@ -132,7 +143,8 @@ public void testAddContainerLifecycleObserver() {
         final AtomicBoolean called = new AtomicBoolean(false);
         try (WeldContainer container = new Weld().disableDiscovery().beanClasses(Foo.class)
                 .addContainerLifecycleObserver(processAnnotatedType(new TypeLiteral>() {
-                }.getType()).notify((e) -> e.veto())).addContainerLifecycleObserver(afterBeanDiscovery((e) -> called.set(true))).initialize()) {
+                }.getType()).notify((e) -> e.veto())).addContainerLifecycleObserver(afterBeanDiscovery((e) -> called.set(true)))
+                .initialize()) {
             assertTrue(called.get());
             assertTrue(container.select(Foo.class).isUnsatisfied());
         }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitClassLoaderScanningTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitClassLoaderScanningTest.java
index bd7ae2148d5..70a9568bdbf 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitClassLoaderScanningTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitClassLoaderScanningTest.java
@@ -25,14 +25,13 @@
 import java.util.Enumeration;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Assert;
-
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.BeanArchive;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.weld.environment.deployment.AbstractWeldDeployment;
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -54,9 +53,12 @@ public void testScanningExplicitClassLoader() throws IOException {
         archive.as(ZipExporter.class).exportTo(jar, true);
 
         /*
-         * Special classloader that hides BDAs in parent classloaders. This would not be needed normally. We need this here because
-         * , since this testsuite defines a top-level beans.xml file, each file in this testsuite is already part of this single giant BDA.
-         * Since we are adding the EmbeddedApplication class to the special BDA we test, we do not want the class to be found twice. We cannot just leave
+         * Special classloader that hides BDAs in parent classloaders. This would not be needed normally. We need this here
+         * because
+         * , since this testsuite defines a top-level beans.xml file, each file in this testsuite is already part of this single
+         * giant BDA.
+         * Since we are adding the EmbeddedApplication class to the special BDA we test, we do not want the class to be found
+         * twice. We cannot just leave
          * out the parent classloader as we need CDI classes to be loadable from the application.
          */
         ClassLoader classLoader = new URLClassLoader(new URL[] { jar.toURI().toURL() }) {
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitResourceLoaderScanningTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitResourceLoaderScanningTest.java
index 9fbff51f6b2..af46fb45760 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitResourceLoaderScanningTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/builder/scanning/ExplicitResourceLoaderScanningTest.java
@@ -33,9 +33,8 @@
 import org.jboss.weld.environment.se.WeldContainer;
 import org.jboss.weld.resources.ClassLoaderResourceLoader;
 import org.jboss.weld.resources.spi.ResourceLoader;
-import org.junit.Test;
-
 import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Simulates a scenario where we have a framework that creates its own {@link ResourceLoader}.
@@ -54,9 +53,12 @@ public void testScanning() throws IOException {
         archive.as(ZipExporter.class).exportTo(jar, true);
 
         /*
-         * Special classloader that hides BDAs in parent classloaders. This would not be needed normally. We need this here because
-         * , since this testsuite defines a top-level beans.xml file, each file in this testsuite is already part of this single giant BDA.
-         * Since we are adding the EmbeddedApplication class to the special BDA we test, we do not want the class to be found twice. We cannot just leave
+         * Special classloader that hides BDAs in parent classloaders. This would not be needed normally. We need this here
+         * because
+         * , since this testsuite defines a top-level beans.xml file, each file in this testsuite is already part of this single
+         * giant BDA.
+         * Since we are adding the EmbeddedApplication class to the special BDA we test, we do not want the class to be found
+         * twice. We cannot just leave
          * out the parent classloader as we need CDI classes to be loadable from the application.
          */
         ClassLoader classLoader = new URLClassLoader(new URL[] { jar.toURI().toURL() }) {
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerEventsTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerEventsTest.java
index 802a83db1d3..e47a88bfacf 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerEventsTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerEventsTest.java
@@ -23,7 +23,6 @@
 import java.util.List;
 
 import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Instance;
 
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
@@ -66,10 +65,12 @@ public void testEventsFired() {
     public void testContainerEventsToString() {
         String id = "007";
         ActionSequence.reset();
-        try (WeldContainer container = new Weld(id).disableDiscovery().beanClasses(ContainerEventToStringObserver.class).initialize()) {
+        try (WeldContainer container = new Weld(id).disableDiscovery().beanClasses(ContainerEventToStringObserver.class)
+                .initialize()) {
             assertFalse(container.select(ContainerEventToStringObserver.class).isUnsatisfied());
         }
-        assertEquals(expectedToStringResult("ContainerInitialized", id), ContainerEventToStringObserver.containerInitializedToString);
+        assertEquals(expectedToStringResult("ContainerInitialized", id),
+                ContainerEventToStringObserver.containerInitializedToString);
         assertEquals(expectedToStringResult("ContainerShutdown", id), ContainerEventToStringObserver.containerShutdownToString);
     }
 
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerObserver.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerObserver.java
index b25b0ea604c..ad1875c1713 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerObserver.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/events/ContainerObserver.java
@@ -31,15 +31,18 @@
 public class ContainerObserver {
 
     public void onAppScopeInit(@Observes @Initialized(ApplicationScoped.class) Object event) {
-        ActionSequence.addAction(ApplicationScoped.class.getName(), event.getClass().getName() + ApplicationScoped.class.getName());
+        ActionSequence.addAction(ApplicationScoped.class.getName(),
+                event.getClass().getName() + ApplicationScoped.class.getName());
     }
 
     public void onAppScopeDestroy(@Observes @Destroyed(ApplicationScoped.class) Object event) {
-        ActionSequence.addAction(ApplicationScoped.class.getName(), event.getClass().getName() + ApplicationScoped.class.getName());
+        ActionSequence.addAction(ApplicationScoped.class.getName(),
+                event.getClass().getName() + ApplicationScoped.class.getName());
     }
 
     public void onAppScopeBeforeDestroy(@Observes @BeforeDestroyed(ApplicationScoped.class) Object event) {
-        ActionSequence.addAction(ApplicationScoped.class.getName(), event.getClass().getName() + ApplicationScoped.class.getName());
+        ActionSequence.addAction(ApplicationScoped.class.getName(),
+                event.getClass().getName() + ApplicationScoped.class.getName());
     }
 
     public void onContainerInitWithQualifier(@Observes @Initialized(ApplicationScoped.class) ContainerInitialized event) {
@@ -62,7 +65,8 @@ public void onContainerBeforeShutdown(@Observes ContainerBeforeShutdown event) {
         ActionSequence.addAction(event.getClass().getName() + event.getContainerId());
     }
 
-    public void onContainerBeforeShutdownWithQualifier(@Observes @BeforeDestroyed(ApplicationScoped.class) ContainerBeforeShutdown event) {
+    public void onContainerBeforeShutdownWithQualifier(
+            @Observes @BeforeDestroyed(ApplicationScoped.class) ContainerBeforeShutdown event) {
         ActionSequence.addAction(event.getClass().getName() + ApplicationScoped.class.getName() + event.getContainerId());
     }
 
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/isolation/ContainerIsolationTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/isolation/ContainerIsolationTest.java
index 8d94e05e74c..8984787c48c 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/isolation/ContainerIsolationTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/isolation/ContainerIsolationTest.java
@@ -16,10 +16,9 @@
  */
 package org.jboss.weld.environment.se.test.container.isolation;
 
-import org.junit.Assert;
-
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/provider/WeldSEProviderTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/provider/WeldSEProviderTest.java
index e16cbab2de7..2807860e586 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/provider/WeldSEProviderTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/container/provider/WeldSEProviderTest.java
@@ -19,7 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -75,7 +74,8 @@ public void testMultipleContainers() {
     @Test
     public void testExtension() {
         TestExtension.reset();
-        try (WeldContainer weldContainer = new Weld().disableDiscovery().beanClasses(Foo.class).addExtension(new TestExtension()).initialize()) {
+        try (WeldContainer weldContainer = new Weld().disableDiscovery().beanClasses(Foo.class)
+                .addExtension(new TestExtension()).initialize()) {
             BeanManager beanManager = TestExtension.beanManagerReference.get();
             assertNotNull(beanManager);
             Bean fooBean = TestExtension.fooBeanReference.get();
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier1.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier1.java
index b218cd5a55b..fac8058c70b 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier1.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier1.java
@@ -16,21 +16,22 @@
  */
 package org.jboss.weld.environment.se.test.events;
 
-import jakarta.inject.Qualifier;
-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.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;
+
 /**
  * @author Peter Royle
  */
 @Qualifier
 @Retention(RUNTIME)
-@Target({PARAMETER, METHOD, FIELD, TYPE})
+@Target({ PARAMETER, METHOD, FIELD, TYPE })
 public @interface EventQualifier1 {
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier2.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier2.java
index 7e4b0ee2ecf..179ce87d875 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier2.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier2.java
@@ -16,21 +16,22 @@
  */
 package org.jboss.weld.environment.se.test.events;
 
-import jakarta.inject.Qualifier;
-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.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;
+
 /**
  * @author Peter Royle
  */
 @Qualifier
 @Retention(RUNTIME)
-@Target({PARAMETER, METHOD, FIELD, TYPE})
+@Target({ PARAMETER, METHOD, FIELD, TYPE })
 public @interface EventQualifier2 {
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/executor/DefaultExecutorTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/executor/DefaultExecutorTest.java
index 99bd50b5c4b..34a2752f0eb 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/executor/DefaultExecutorTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/executor/DefaultExecutorTest.java
@@ -16,8 +16,6 @@
  */
 package org.jboss.weld.environment.se.test.executor;
 
-import org.junit.Assert;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
@@ -26,6 +24,7 @@
 import org.jboss.weld.executor.CommonForkJoinPoolExecutorServices;
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.manager.api.ExecutorServices;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Plant.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Plant.java
index 8b67374307c..4a764fee085 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Plant.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Plant.java
@@ -20,15 +20,15 @@
 
 public abstract class Plant {
 
-	public static boolean postConstructCalled = false;
+    public static boolean postConstructCalled = false;
 
-	public Plant() {
-		super();
-	}
+    public Plant() {
+        super();
+    }
 
-	@PostConstruct
-	public void init() {
-		postConstructCalled = true;
-	}
+    @PostConstruct
+    public void init() {
+        postConstructCalled = true;
+    }
 
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/PostConstructInheritanceTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/PostConstructInheritanceTest.java
index 8d9f1293130..da4f5bd1e56 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/PostConstructInheritanceTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/PostConstructInheritanceTest.java
@@ -29,20 +29,20 @@
  */
 public class PostConstructInheritanceTest {
 
-	@Test
-	public void testPostConstructInherited() {
+    @Test
+    public void testPostConstructInherited() {
 
-		Weld weld = new Weld();
-		try {
+        Weld weld = new Weld();
+        try {
 
-			Plant.postConstructCalled = false;
-			WeldContainer weldContainer = weld.initialize();
-			weldContainer.instance().select(Tree.class).get();
-			assertTrue(Plant.postConstructCalled);
+            Plant.postConstructCalled = false;
+            WeldContainer weldContainer = weld.initialize();
+            weldContainer.instance().select(Tree.class).get();
+            assertTrue(Plant.postConstructCalled);
 
-		} finally {
-			weld.shutdown();
-		}
-	}
+        } finally {
+            weld.shutdown();
+        }
+    }
 
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Tree.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Tree.java
index 8f45a7d8ae0..6f13c31cc53 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Tree.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/inheritance/Tree.java
@@ -21,8 +21,8 @@
 @Singleton
 public class Tree extends Plant {
 
-	public Tree() {
-		super();
-	}
+    public Tree() {
+        super();
+    }
 
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/instance/SimpleInstanceTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/instance/SimpleInstanceTest.java
index d56d73ac516..0db53b8550b 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/instance/SimpleInstanceTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/instance/SimpleInstanceTest.java
@@ -1,8 +1,8 @@
 package org.jboss.weld.environment.se.test.instance;
 
-import org.junit.Assert;
 import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java
index 708959c2d65..55bfd1be5e3 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java
@@ -17,14 +17,15 @@
 
 package org.jboss.weld.environment.se.test.interceptors;
 
-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.interceptor.InterceptorBinding;
 
 /**
  * Test annotation used to apply the AggregatingInterceptor to types and methods.
@@ -33,7 +34,7 @@
  */
 @Inherited
 @InterceptorBinding
-@Target({TYPE, METHOD})
+@Target({ TYPE, METHOD })
 @Retention(RUNTIME)
 public @interface Aggregated {
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java
index 3a10980c230..b7fc95f8416 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java
@@ -17,14 +17,15 @@
 
 package org.jboss.weld.environment.se.test.interceptors;
 
-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.interceptor.InterceptorBinding;
 
 /**
  * Test annotation used to apply the RecordingInterceptor to types and methods.
@@ -33,7 +34,7 @@
  */
 @Inherited
 @InterceptorBinding
-@Target({TYPE, METHOD})
+@Target({ TYPE, METHOD })
 @Retention(RUNTIME)
 public @interface Recorded {
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
index 3c850f7faa6..769c8577682 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
@@ -17,11 +17,12 @@
 
 package org.jboss.weld.environment.se.test.interceptors;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jakarta.interceptor.AroundInvoke;
 import jakarta.interceptor.Interceptor;
 import jakarta.interceptor.InvocationContext;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author Peter Royle
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java
index 6ef378cf2de..25b422baa8e 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java
@@ -17,14 +17,15 @@
 
 package org.jboss.weld.environment.se.test.interceptors;
 
-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.interceptor.InterceptorBinding;
 
 /**
  * Test annotation used to apply both the RecordingInterceptor and the AggregatingInterceptor to types and methods.
@@ -33,7 +34,7 @@
  */
 @Inherited
 @InterceptorBinding
-@Target({TYPE, METHOD})
+@Target({ TYPE, METHOD })
 @Retention(RUNTIME)
 @Recorded
 @Aggregated
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/InterceptorEnabledForAppAndArchiveTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/InterceptorEnabledForAppAndArchiveTest.java
index ffffdb01b37..c4687c54dac 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/InterceptorEnabledForAppAndArchiveTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/InterceptorEnabledForAppAndArchiveTest.java
@@ -30,7 +30,9 @@ public class InterceptorEnabledForAppAndArchiveTest {
 
     @Test
     public void testInitialization() {
-        try (WeldContainer container = new Weld().disableDiscovery().beanClasses(TransasctionalService.class, TransactionalInterceptor.class).addInterceptor(TransactionalInterceptor.class)
+        try (WeldContainer container = new Weld().disableDiscovery()
+                .beanClasses(TransasctionalService.class, TransactionalInterceptor.class)
+                .addInterceptor(TransactionalInterceptor.class)
                 .initialize()) {
             ActionSequence.reset();
             container.select(TransasctionalService.class).get().ping();
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/Transactional.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/Transactional.java
index 6c19ac0423a..e8725bdecbd 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/Transactional.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/interceptors/enablement/Transactional.java
@@ -30,7 +30,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@Target({ElementType.METHOD, ElementType.TYPE})
+@Target({ ElementType.METHOD, ElementType.TYPE })
 public @interface Transactional {
 
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Camera.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Camera.java
index c60c43d0f74..b23e70e8a02 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Camera.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Camera.java
@@ -1,7 +1,7 @@
 package org.jboss.weld.environment.se.test.isolation;
 
 public interface Camera {
-    
+
     public void capture();
 
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/CameraDecorator.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/CameraDecorator.java
index fd196e50f75..a4ccec43627 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/CameraDecorator.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/CameraDecorator.java
@@ -6,11 +6,11 @@
 
 @Decorator
 public class CameraDecorator implements Camera {
-    
+
     @Inject
     @Delegate
     private Camera delegate;
-    
+
     public static int invocations = 0;
 
     @Override
@@ -18,5 +18,5 @@ public void capture() {
         invocations++;
         delegate.capture();
     }
-    
+
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Digital.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Digital.java
index 3b345594e5a..0ab74b21e23 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Digital.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Digital.java
@@ -2,12 +2,14 @@
 
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import jakarta.inject.Qualifier;
 
 @Qualifier
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target({ METHOD, FIELD, PARAMETER, TYPE })
 public @interface Digital {
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/IsolationDisabledTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/IsolationDisabledTest.java
index 7f90cdfe9cc..e0475166e1d 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/IsolationDisabledTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/IsolationDisabledTest.java
@@ -47,8 +47,8 @@ public static Archive getDeployment() {
                         .decorators(CameraDecorator.class)
                         .alternatives(RangefinderCamera.class)
                         .excludeFilters(
-                                Exclude.exact(PinholeCamera.class).ifClassAvailable(DSLR.class)
-                        ), "beans.xml")
+                                Exclude.exact(PinholeCamera.class).ifClassAvailable(DSLR.class)),
+                        "beans.xml")
                 .addClasses(ZoomInterceptor.class, CameraDecorator.class, RangefinderCamera.class);
 
         JavaArchive archive02 = ShrinkWrap.create(BeanArchive.class)
@@ -95,7 +95,7 @@ public void testExcludeFilters(BeanManager bm) {
 
     private Set> getBeanClasses(BeanManager bm, Type beanType, Annotation... annotations) {
         Set> classes = new HashSet>();
-        for(Bean bean : bm.getBeans(beanType, annotations)) {
+        for (Bean bean : bm.getBeans(beanType, annotations)) {
             classes.add(bean.getBeanClass());
         }
         return classes;
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Zoom.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Zoom.java
index c323a8c16f8..b707272af1f 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Zoom.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/isolation/Zoom.java
@@ -2,12 +2,14 @@
 
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
 import jakarta.interceptor.InterceptorBinding;
 
 @InterceptorBinding
 @Retention(RUNTIME)
-@Target({METHOD, TYPE})
+@Target({ METHOD, TYPE })
 public @interface Zoom {
 }
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/BasicCDIProviderTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/BasicCDIProviderTest.java
index 340803e6760..278d4e69fcf 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/BasicCDIProviderTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/BasicCDIProviderTest.java
@@ -39,7 +39,8 @@ public class BasicCDIProviderTest extends AbstractCDIProviderTest {
 
     @Deployment
     public static Archive getArchive() {
-        return ShrinkWrap.create(BeanArchive.class).addClasses(Boy.class, Chick.class, Child.class, Female.class, Girl.class, KarateClub.class, KarateClubLocator.class, Male.class, Pretty.class, PrettyLiteral.class);
+        return ShrinkWrap.create(BeanArchive.class).addClasses(Boy.class, Chick.class, Child.class, Female.class, Girl.class,
+                KarateClub.class, KarateClubLocator.class, Male.class, Pretty.class, PrettyLiteral.class);
     }
 
     @Test
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Female.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Female.java
index 6a4d76d05b6..eebd58556db 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Female.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Female.java
@@ -1,38 +1,38 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.environment.se.test.provider;
-
-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
-@Inherited
-@Qualifier
-public @interface Female {
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.environment.se.test.provider;
+
+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
+@Inherited
+@Qualifier
+public @interface Female {
+}
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Male.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Male.java
index 3b3b9222374..a5e33d0cfc1 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Male.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Male.java
@@ -1,36 +1,36 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.environment.se.test.provider;
-
-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 Male {
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.environment.se.test.provider;
+
+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 Male {
+}
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/MultiModuleCDIProviderTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/MultiModuleCDIProviderTest.java
index c55eb21fe62..caaf71adca6 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/MultiModuleCDIProviderTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/MultiModuleCDIProviderTest.java
@@ -35,7 +35,8 @@ public class MultiModuleCDIProviderTest extends AbstractCDIProviderTest {
 
     @Deployment
     public static Archive getArchive() {
-        JavaArchive bda1 = ShrinkWrap.create(BeanArchive.class).addClasses(Boy.class, Chick.class, Child.class, Female.class, Girl.class, KarateClub.class, Male.class, Pretty.class, PrettyLiteral.class);
+        JavaArchive bda1 = ShrinkWrap.create(BeanArchive.class).addClasses(Boy.class, Chick.class, Child.class, Female.class,
+                Girl.class, KarateClub.class, Male.class, Pretty.class, PrettyLiteral.class);
         JavaArchive bda2 = ShrinkWrap.create(BeanArchive.class).addClasses(Foo.class);
         JavaArchive jar = ShrinkWrap.create(JavaArchive.class).addClass(KarateClubLocator.class);
         return ShrinkWrap.create(WeldSEClassPath.class).add(bda1, bda2, jar);
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Pretty.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Pretty.java
index 6c3548087fd..99849bda7e0 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Pretty.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/Pretty.java
@@ -1,36 +1,36 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.environment.se.test.provider;
-
-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 Pretty {
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.environment.se.test.provider;
+
+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 Pretty {
+}
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/PrettyLiteral.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/PrettyLiteral.java
index 47040ddaf4a..af7ad2c79a6 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/PrettyLiteral.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/PrettyLiteral.java
@@ -1,30 +1,30 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,  
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.environment.se.test.provider;
-
-import jakarta.enterprise.util.AnnotationLiteral;
-
-@SuppressWarnings("all")
-public class PrettyLiteral extends AnnotationLiteral implements Pretty {
-
-    private static final long serialVersionUID = 1L;
-
-    public static final Pretty INSTANCE = new PrettyLiteral();
-
-    private PrettyLiteral() {
-    }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.environment.se.test.provider;
+
+import jakarta.enterprise.util.AnnotationLiteral;
+
+@SuppressWarnings("all")
+public class PrettyLiteral extends AnnotationLiteral implements Pretty {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final Pretty INSTANCE = new PrettyLiteral();
+
+    private PrettyLiteral() {
+    }
+}
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/CustomCDIProvider.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/CustomCDIProvider.java
index d2e6ad1b503..72f1e2f214f 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/CustomCDIProvider.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/CustomCDIProvider.java
@@ -17,6 +17,9 @@
 
 package org.jboss.weld.environment.se.test.provider.custom;
 
+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;
@@ -24,9 +27,6 @@
 import jakarta.enterprise.inject.spi.CDIProvider;
 import jakarta.enterprise.util.TypeLiteral;
 
-import java.lang.annotation.Annotation;
-import java.util.Iterator;
-
 /**
  * @author Martin Kouba
  *
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/TestCDI.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/TestCDI.java
index 6dc387d9bd6..2c959bbccba 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/TestCDI.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/provider/custom/TestCDI.java
@@ -33,7 +33,8 @@
 public class TestCDI extends CDI {
 
     /**
-     * WORKAROUND - it's not possible to unset the CDIProvider via {@link CDI#setCDIProvider(jakarta.enterprise.inject.spi.CDIProvider)} but it's possible to set the field
+     * WORKAROUND - it's not possible to unset the CDIProvider via
+     * {@link CDI#setCDIProvider(jakarta.enterprise.inject.spi.CDIProvider)} but it's possible to set the field
      * value directly in a subclass. However, it was probably not intended for the subclass to be able to do this.
      */
     public static void unsetCDIProvider() {
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/scopes/ScopesTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/scopes/ScopesTest.java
index 92f09c70121..9aac6adc723 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/scopes/ScopesTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/scopes/ScopesTest.java
@@ -16,7 +16,6 @@
  */
 package org.jboss.weld.environment.se.test.scopes;
 
-
 import static org.junit.Assert.assertEquals;
 
 import jakarta.enterprise.inject.spi.BeanManager;
diff --git a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/unmanaged/UnmanagedTest.java b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/unmanaged/UnmanagedTest.java
index d548bd19f38..b77f1e8f922 100644
--- a/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/unmanaged/UnmanagedTest.java
+++ b/environments/se/core/src/test/java/org/jboss/weld/environment/se/test/unmanaged/UnmanagedTest.java
@@ -19,14 +19,13 @@
 import jakarta.enterprise.inject.spi.Unmanaged;
 import jakarta.enterprise.inject.spi.Unmanaged.UnmanagedInstance;
 
-import org.junit.Assert;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.BeanArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.weld.environment.se.test.arquillian.WeldSEClassPath;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/OptimizedCleanupTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/OptimizedCleanupTest.java
index 453ca1899f3..1b30914bb51 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/OptimizedCleanupTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/OptimizedCleanupTest.java
@@ -40,13 +40,16 @@ public class OptimizedCleanupTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(OptimizedCleanupTest.class, Foo.class, TestExtension.class)).build();
+        return ClassPath.builder().add(
+                ShrinkWrap.create(BeanArchive.class).addClasses(OptimizedCleanupTest.class, Foo.class, TestExtension.class))
+                .build();
     }
 
     @Test
     public void testEnabled() {
         TestExtension.PIT_OBSERVED.set(false);
-        try (WeldContainer container = new Weld().addExtension(new TestExtension()).property(Weld.ALLOW_OPTIMIZED_CLEANUP, Boolean.TRUE)
+        try (WeldContainer container = new Weld().addExtension(new TestExtension())
+                .property(Weld.ALLOW_OPTIMIZED_CLEANUP, Boolean.TRUE)
                 .initialize()) {
             BeanManagerImpl beanManager = BeanManagerProxy.unwrap(container.getBeanManager());
             Bean fooBean = beanManager.resolve(beanManager.getBeans(Foo.class));
@@ -60,7 +63,8 @@ public void testEnabled() {
     @Test
     public void testDisabled() {
         TestExtension.PIT_OBSERVED.set(false);
-        try (WeldContainer container = new Weld().addExtension(new TestExtension()).property(Weld.ALLOW_OPTIMIZED_CLEANUP, Boolean.FALSE)
+        try (WeldContainer container = new Weld().addExtension(new TestExtension())
+                .property(Weld.ALLOW_OPTIMIZED_CLEANUP, Boolean.FALSE)
                 .initialize()) {
             BeanManagerImpl beanManager = BeanManagerProxy.unwrap(container.getBeanManager());
             Bean fooBean = beanManager.resolve(beanManager.getBeans(Foo.class));
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/TestExtension.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/TestExtension.java
index 234a27f1266..d46f58ca8f7 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/TestExtension.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/cleanup/TestExtension.java
@@ -28,14 +28,14 @@ public class TestExtension implements Extension {
 
     static final AtomicBoolean PIT_OBSERVED = new AtomicBoolean(false);
 
-   // This observer is always dropped after bootstrap
-   void observeFooPat(@Observes ProcessAnnotatedType event) {
-       event.configureAnnotatedType().removeAll().add(ApplicationScoped.Literal.INSTANCE);
-   }
+    // This observer is always dropped after bootstrap
+    void observeFooPat(@Observes ProcessAnnotatedType event) {
+        event.configureAnnotatedType().removeAll().add(ApplicationScoped.Literal.INSTANCE);
+    }
 
-   // This observer is only dropped if optimized cleanup is allowed
-   void observeFooPit(@Observes ProcessInjectionTarget event) {
-       PIT_OBSERVED.set(true);
-   }
+    // This observer is only dropped if optimized cleanup is allowed
+    void observeFooPit(@Observes ProcessInjectionTarget event) {
+        PIT_OBSERVED.set(true);
+    }
 
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSEService.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSEService.java
index 119151fcc47..ee3dc467765 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSEService.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSEService.java
@@ -44,7 +44,8 @@ public class ContextPropagationSEService {
     public static  Future propagateContextsAndSubmitTask(Callable task) {
         // gather all the contexts we want to propagate and the instances in them
         Map, Collection>> scopeToContextualInstances = new HashMap<>();
-        for (WeldAlterableContext context : WeldContainer.current().select(WeldManager.class).get().getActiveWeldAlterableContexts()) {
+        for (WeldAlterableContext context : WeldContainer.current().select(WeldManager.class).get()
+                .getActiveWeldAlterableContexts()) {
             scopeToContextualInstances.put(context.getScope(), context.getAllContextualInstances());
         }
         // We create a task wrapper which will make sure we have contexts propagated
@@ -54,7 +55,8 @@ public static  Future propagateContextsAndSubmitTask(Callable task) {
             public T call() throws Exception {
                 WeldContainer container = WeldContainer.current();
                 WeldManager weldManager = container.select(WeldManager.class).get();
-                BoundRequestContext requestContext = weldManager.instance().select(BoundRequestContext.class, BoundLiteral.INSTANCE).get();
+                BoundRequestContext requestContext = weldManager.instance()
+                        .select(BoundRequestContext.class, BoundLiteral.INSTANCE).get();
 
                 // we will be using bound context, prepare backing map
                 Map requestMap = new HashMap<>();
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSETest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSETest.java
index 35284efc9ca..f6335a269d9 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSETest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/propagation/ContextPropagationSETest.java
@@ -45,8 +45,9 @@ public class ContextPropagationSETest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder()
-            .add(ShrinkWrap.create(BeanArchive.class)
-                .addPackage(ContextPropagationSETest.class.getPackage())).build();
+                .add(ShrinkWrap.create(BeanArchive.class)
+                        .addPackage(ContextPropagationSETest.class.getPackage()))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Baz.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Baz.java
index 242109b1c19..63e0dcb49cf 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Baz.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Baz.java
@@ -21,7 +21,6 @@
 
 import org.jboss.weld.context.activator.ActivateRequestContext;
 
-
 @ActivateRequestContext
 @Dependent
 public class Baz {
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Foo.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Foo.java
index 2fc332b9e3a..0ee6da46ac2 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Foo.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/Foo.java
@@ -49,5 +49,4 @@ public void notInterceptedCall() {
         bar.increment();
     }
 
-
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/RequestScopedActiveInterceptorTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/RequestScopedActiveInterceptorTest.java
index 3e9ed7aa22c..99e73859676 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/RequestScopedActiveInterceptorTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/RequestScopedActiveInterceptorTest.java
@@ -37,7 +37,8 @@ public class RequestScopedActiveInterceptorTest {
     public static Archive createTestArchive() {
         return ClassPath.builder()
                 .add(ShrinkWrap.create(BeanArchive.class)
-                        .addClasses(RequestScopedActiveInterceptorTest.class, Foo.class, Bar.class, Baz.class)).build();
+                        .addClasses(RequestScopedActiveInterceptorTest.class, Foo.class, Bar.class, Baz.class))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Beta.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Beta.java
index 86e4b2b78cb..718c9747a68 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Beta.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Beta.java
@@ -22,12 +22,12 @@
 @Dependent
 public class Beta {
 
-    public void ping(){
+    public void ping() {
 
     }
 
     @PostConstruct
-    public void init(){
+    public void init() {
 
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/ContextEventsFiredForPostConstructTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/ContextEventsFiredForPostConstructTest.java
index ead6bd7f0ec..c48e6cc87fd 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/ContextEventsFiredForPostConstructTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/ContextEventsFiredForPostConstructTest.java
@@ -38,7 +38,9 @@ public class ContextEventsFiredForPostConstructTest {
     public static Archive createTestArchive() {
         return ClassPath.builder()
                 .add(ShrinkWrap.create(BeanArchive.class)
-                        .addClasses(ContextEventsFiredForPostConstructTest.class, ContextLifecycleObserver.class, Alpha.class, Beta.class, Gama.class)).build();
+                        .addClasses(ContextEventsFiredForPostConstructTest.class, ContextLifecycleObserver.class, Alpha.class,
+                                Beta.class, Gama.class))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Gama.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Gama.java
index 5617331811e..f5724f4083e 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Gama.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/requestScope/postConstruct/Gama.java
@@ -22,7 +22,7 @@
 @Dependent
 public class Gama {
 
-    public void ping(){
+    public void ping() {
 
     }
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/threadScope/ThreadScopedActiveInterceptorTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/threadScope/ThreadScopedActiveInterceptorTest.java
index 0a5825b8340..864a15dd410 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/threadScope/ThreadScopedActiveInterceptorTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/context/threadScope/ThreadScopedActiveInterceptorTest.java
@@ -38,7 +38,8 @@ public class ThreadScopedActiveInterceptorTest {
     public static Archive createTestArchive() {
         return ClassPath.builder()
                 .add(ShrinkWrap.create(BeanArchive.class)
-                        .addClasses(ThreadScopedActiveInterceptorTest.class, Foo.class, Bar.class, Counter.class)).build();
+                        .addClasses(ThreadScopedActiveInterceptorTest.class, Foo.class, Bar.class, Counter.class))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/decorator/invalid/DecoratorWithPrivateConstructorTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/decorator/invalid/DecoratorWithPrivateConstructorTest.java
index 4e4dcb56d44..1427cc5f954 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/decorator/invalid/DecoratorWithPrivateConstructorTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/decorator/invalid/DecoratorWithPrivateConstructorTest.java
@@ -40,17 +40,19 @@ public class DecoratorWithPrivateConstructorTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder()
-            .add(ShrinkWrap.create(BeanArchive.class)
-                .addPackage(DecoratorWithPrivateConstructorTest.class.getPackage())).build();
+                .add(ShrinkWrap.create(BeanArchive.class)
+                        .addPackage(DecoratorWithPrivateConstructorTest.class.getPackage()))
+                .build();
     }
 
     @Test(expected = DeploymentException.class)
     public void testExceptionIsThrownWithoutRelaxedMode() {
         Weld weld = new Weld();
-        try (WeldContainer container = weld.disableDiscovery().addPackages(DecoratorWithPrivateConstructorTest.class.getPackage())
-            // NOTE: in SE this is by default true
-            .property("org.jboss.weld.construction.relaxed", false)
-            .initialize()) {
+        try (WeldContainer container = weld.disableDiscovery()
+                .addPackages(DecoratorWithPrivateConstructorTest.class.getPackage())
+                // NOTE: in SE this is by default true
+                .property("org.jboss.weld.construction.relaxed", false)
+                .initialize()) {
             container.select(ImplementingBean.class).get().ping();
         }
     }
@@ -58,9 +60,10 @@ public void testExceptionIsThrownWithoutRelaxedMode() {
     @Test(expected = DeploymentException.class)
     public void testExceptionIsThrownWithRelaxedMode() {
         Weld weld = new Weld();
-        try (WeldContainer container = weld.disableDiscovery().addPackages(DecoratorWithPrivateConstructorTest.class.getPackage())
-            .property("org.jboss.weld.construction.relaxed", true)
-            .initialize()) {
+        try (WeldContainer container = weld.disableDiscovery()
+                .addPackages(DecoratorWithPrivateConstructorTest.class.getPackage())
+                .property("org.jboss.weld.construction.relaxed", true)
+                .initialize()) {
             container.select(ImplementingBean.class).get().ping();
         }
     }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/MultipleDeploymentErrorsTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/MultipleDeploymentErrorsTest.java
index d2717610b95..9b9b6159d07 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/MultipleDeploymentErrorsTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/MultipleDeploymentErrorsTest.java
@@ -41,7 +41,8 @@ public class MultipleDeploymentErrorsTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addPackage(MultipleDeploymentErrorsTest.class.getPackage())).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addPackage(MultipleDeploymentErrorsTest.class.getPackage())).build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/SingleDeploymentErrorTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/SingleDeploymentErrorTest.java
index 066901e3a84..5c22f3ce1be 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/SingleDeploymentErrorTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/deployment/errors/SingleDeploymentErrorTest.java
@@ -41,7 +41,8 @@ public class SingleDeploymentErrorTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addPackage(SingleDeploymentErrorTest.class.getPackage())).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addPackage(SingleDeploymentErrorTest.class.getPackage())).build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beanDefiningAnnotations/AdditionalBeanDefiningAnnotationsTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beanDefiningAnnotations/AdditionalBeanDefiningAnnotationsTest.java
index 5d3b42fc463..9cde75db95a 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beanDefiningAnnotations/AdditionalBeanDefiningAnnotationsTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beanDefiningAnnotations/AdditionalBeanDefiningAnnotationsTest.java
@@ -16,6 +16,11 @@
  */
 package org.jboss.weld.environment.se.test.discovery.beanDefiningAnnotations;
 
+import java.lang.annotation.Annotation;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
 import org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -29,12 +34,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.lang.annotation.Annotation;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
-
 /**
  * Adds new bean defining annotations in Weld SE, then leaves discovery on and asserts that beans were found.
  *
@@ -50,17 +49,18 @@ public class AdditionalBeanDefiningAnnotationsTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addPackage(AdditionalBeanDefiningAnnotationsTest.class.getPackage()))
-            .build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addPackage(AdditionalBeanDefiningAnnotationsTest.class.getPackage()))
+                .build();
     }
 
     @Test
     public void testNewBeanDefiningAnnotationWorks() {
         Weld weld = new Weld()
-            .disableDiscovery()
-            .setBeanDiscoveryMode(BeanDiscoveryMode.ANNOTATED)
-            .addPackages(Bar.class.getPackage())
-            .addBeanDefiningAnnotations(NewBeanDefiningAnnotation.class);
+                .disableDiscovery()
+                .setBeanDiscoveryMode(BeanDiscoveryMode.ANNOTATED)
+                .addPackages(Bar.class.getPackage())
+                .addBeanDefiningAnnotations(NewBeanDefiningAnnotation.class);
 
         try (WeldContainer container = weld.initialize()) {
             Assert.assertTrue(container.isRunning());
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Bar.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Bar.java
index 7692347cfa2..d4dd5727dd1 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Bar.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Bar.java
@@ -19,7 +19,7 @@
 
 // no bean defining annotation - only discovered in "all" discovery mode
 public class Bar {
-    public void ping(){
+    public void ping() {
         // empty
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Foo.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Foo.java
index 1501df486d7..f615989f1a0 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Foo.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/Foo.java
@@ -23,7 +23,7 @@
 @ApplicationScoped
 public class Foo {
 
-    public void ping(){
-      // empty
+    public void ping() {
+        // empty
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/LegacyEmptyBeansXmlTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/LegacyEmptyBeansXmlTest.java
index 7343e7046df..9e2bd2856e9 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/LegacyEmptyBeansXmlTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/beansXml/empty/legacy/LegacyEmptyBeansXmlTest.java
@@ -42,9 +42,9 @@ public class LegacyEmptyBeansXmlTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder().add(ShrinkWrap.create(JavaArchive.class)
-                        .addPackage(LegacyEmptyBeansXmlTest.class.getPackage())
-                        // make sure we add empty beans.xml
-                        .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"))
+                .addPackage(LegacyEmptyBeansXmlTest.class.getPackage())
+                // make sure we add empty beans.xml
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"))
                 .build();
     }
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/disableJandex/JandexDiscoveryStrategyDisabledTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/disableJandex/JandexDiscoveryStrategyDisabledTest.java
index c9f1622624d..b667349cf94 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/disableJandex/JandexDiscoveryStrategyDisabledTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/disableJandex/JandexDiscoveryStrategyDisabledTest.java
@@ -44,10 +44,11 @@ public class JandexDiscoveryStrategyDisabledTest {
     @Deployment
     public static Archive createTestArchive() {
         File oldJandex = Maven.resolver().resolve("org.jboss:jandex:1.0.3.Final").withTransitivity().asSingleFile();
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addPackage(JandexDiscoveryStrategyDisabledTest.class.getPackage()))
-            .add(oldJandex) //add prehistoric Jandex to CP
-            .addSystemProperty(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, "true") //disable jandex discovery strategy
-            .build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addPackage(JandexDiscoveryStrategyDisabledTest.class.getPackage()))
+                .add(oldJandex) //add prehistoric Jandex to CP
+                .addSystemProperty(Jandex.DISABLE_JANDEX_DISCOVERY_STRATEGY, "true") //disable jandex discovery strategy
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/handler/AdditionalBeanArchiveHandlerTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/handler/AdditionalBeanArchiveHandlerTest.java
index ab03ab85c08..5983c84c156 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/handler/AdditionalBeanArchiveHandlerTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/handler/AdditionalBeanArchiveHandlerTest.java
@@ -54,7 +54,9 @@ public class AdditionalBeanArchiveHandlerTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addPackage(AdditionalBeanArchiveHandlerTest.class.getPackage())).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addPackage(AdditionalBeanArchiveHandlerTest.class.getPackage()))
+                .build();
     }
 
     @Test
@@ -146,7 +148,8 @@ public InputStream getInputStream() throws IOException {
             if (url.toString().contains("beans.xml")) {
                 return new ByteArrayInputStream("".getBytes());
             } else if (url.toString().contains("services")) {
-                return new ByteArrayInputStream((TestBeanArchiveHandler1.class.getName() + "\n" + TestBeanArchiveHandler2.class.getName()).getBytes());
+                return new ByteArrayInputStream(
+                        (TestBeanArchiveHandler1.class.getName() + "\n" + TestBeanArchiveHandler2.class.getName()).getBytes());
             }
             return null;
         }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/isolation/IsolationDisabledTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/isolation/IsolationDisabledTest.java
index 2a98957ff21..baf129cf178 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/isolation/IsolationDisabledTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/isolation/IsolationDisabledTest.java
@@ -35,7 +35,8 @@ public class IsolationDisabledTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        JavaArchive common = ShrinkWrap.create(JavaArchive.class).addClasses(IsolationDisabledTest.class, FooInterceptor.class, FooBinding.class);
+        JavaArchive common = ShrinkWrap.create(JavaArchive.class).addClasses(IsolationDisabledTest.class, FooInterceptor.class,
+                FooBinding.class);
         JavaArchive bda1 = ShrinkWrap.create(BeanArchive.class).addClass(Rorschach.class);
         JavaArchive bda2 = ShrinkWrap.create(BeanArchive.class).intercept(FooInterceptor.class).addClass(Comedian.class);
         return ClassPath.builder().add(common, bda1, bda2).build();
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/SyntheticArchiveDiscoveryModeChangeTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/SyntheticArchiveDiscoveryModeChangeTest.java
index add6835085d..de7486179a8 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/SyntheticArchiveDiscoveryModeChangeTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/SyntheticArchiveDiscoveryModeChangeTest.java
@@ -39,13 +39,15 @@ public class SyntheticArchiveDiscoveryModeChangeTest {
 
     @Deployment
     public static Archive getDeployment() {
-        return ShrinkWrap.create(BeanArchive.class).annotated().addPackages(true, SyntheticArchiveDiscoveryModeChangeTest.class.getPackage());
+        return ShrinkWrap.create(BeanArchive.class).annotated().addPackages(true,
+                SyntheticArchiveDiscoveryModeChangeTest.class.getPackage());
     }
 
     @Test
     public void testDiscoveryModeAnnotated() {
         Weld weld = new Weld();
-        weld.disableDiscovery().setBeanDiscoveryMode(BeanDiscoveryMode.ANNOTATED).addPackages(Foo.class.getPackage(), Bar.class.getPackage());
+        weld.disableDiscovery().setBeanDiscoveryMode(BeanDiscoveryMode.ANNOTATED).addPackages(Foo.class.getPackage(),
+                Bar.class.getPackage());
         try (WeldContainer container = weld.initialize()) {
             Assert.assertTrue(container.isRunning());
             Assert.assertTrue(container.select(Foo.class).isResolvable());
@@ -57,7 +59,8 @@ public void testDiscoveryModeAnnotated() {
     public void testDiscoveryModeAll() {
         Weld weld = new Weld();
         // this is same as default
-        weld.disableDiscovery().setBeanDiscoveryMode(BeanDiscoveryMode.ALL).addPackages(Foo.class.getPackage(), Bar.class.getPackage());
+        weld.disableDiscovery().setBeanDiscoveryMode(BeanDiscoveryMode.ALL).addPackages(Foo.class.getPackage(),
+                Bar.class.getPackage());
         try (WeldContainer container = weld.initialize()) {
             Assert.assertTrue(container.isRunning());
             Assert.assertTrue(container.select(Foo.class).isResolvable());
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/discoveredPackage/Foo.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/discoveredPackage/Foo.java
index 37e48c3b340..8767f0717e4 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/discoveredPackage/Foo.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/discoveredPackage/Foo.java
@@ -24,5 +24,5 @@
  */
 @Dependent
 public class Foo {
-    
+
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/hiddenPackage/Bar.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/hiddenPackage/Bar.java
index e0784d2e608..31110ddf8b6 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/hiddenPackage/Bar.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/synthetic/bdm/hiddenPackage/Bar.java
@@ -21,5 +21,5 @@
  * @author Matej Novotny
  */
 public class Bar {
-    
+
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/UselessStereotype.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/UselessStereotype.java
index 843cc24f2d5..50142c904ec 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/UselessStereotype.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/UselessStereotype.java
@@ -24,7 +24,7 @@
 
 import jakarta.enterprise.inject.Stereotype;
 
-@Target({PARAMETER})
+@Target({ PARAMETER })
 @Retention(RUNTIME)
 @Stereotype
 public @interface UselessStereotype {
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/WithAnnotationsTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/WithAnnotationsTest.java
index 5e038d61205..e3c558054b8 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/WithAnnotationsTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/discovery/withAnnotations/WithAnnotationsTest.java
@@ -38,8 +38,11 @@ public class WithAnnotationsTest {
 
     @Deployment
     public static Archive getDeployment() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(WithAnnotationsTest.class))
-                .addPackage(WithAnnotationsTest.class.getPackage()).addAsServiceProvider(Extension.class, VerifyingExtension.class)).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(WithAnnotationsTest.class))
+                        .addPackage(WithAnnotationsTest.class.getPackage())
+                        .addAsServiceProvider(Extension.class, VerifyingExtension.class))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/async/classLoader/AsyncEventNotificationPreservesTCCLTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/async/classLoader/AsyncEventNotificationPreservesTCCLTest.java
index a70c1808a35..0b5af9f1a06 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/async/classLoader/AsyncEventNotificationPreservesTCCLTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/async/classLoader/AsyncEventNotificationPreservesTCCLTest.java
@@ -17,6 +17,11 @@
 
 package org.jboss.weld.environment.se.test.event.async.classLoader;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import jakarta.enterprise.event.Event;
+
 import org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -30,10 +35,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import jakarta.enterprise.event.Event;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Tests that async observer notification preserves TCCL that the original application had.
  * Test runs in SE where we use different executor than in EE.
@@ -46,8 +47,11 @@ public class AsyncEventNotificationPreservesTCCLTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(AsyncEventNotificationPreservesTCCLTest.class))
-                .addPackage(AsyncEventNotificationPreservesTCCLTest.class.getPackage())).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap
+                        .create(BeanArchive.class, Utils.getDeploymentNameAsHash(AsyncEventNotificationPreservesTCCLTest.class))
+                        .addPackage(AsyncEventNotificationPreservesTCCLTest.class.getPackage()))
+                .build();
     }
 
     @Test
@@ -72,4 +76,4 @@ public void testAsyncEventHasSameTccl() {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/ObservingBean.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/ObservingBean.java
index 9ed9997a406..7d306944947 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/ObservingBean.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/ObservingBean.java
@@ -17,6 +17,9 @@
 
 package org.jboss.weld.environment.se.test.event.container.lifecycle;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.BeforeDestroyed;
 import jakarta.enterprise.context.Initialized;
@@ -24,9 +27,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/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/StartupShutdownTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/StartupShutdownTest.java
index d4dd74215e1..e08b7d0782f 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/StartupShutdownTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/container/lifecycle/StartupShutdownTest.java
@@ -20,6 +20,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Shutdown;
 import jakarta.enterprise.event.Startup;
+
 import org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -38,8 +39,10 @@ public class StartupShutdownTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(StartupShutdownTest.class))
-                .addPackage(StartupShutdownTest.class.getPackage())).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(StartupShutdownTest.class))
+                        .addPackage(StartupShutdownTest.class.getPackage()))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/ObservingBean.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/ObservingBean.java
index 8e33c1b58df..249c090e2df 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/ObservingBean.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/ObservingBean.java
@@ -27,7 +27,7 @@
  */
 @ApplicationScoped
 public class ObservingBean {
-    
+
     private boolean fooObserved = false;
     private boolean barObserved = false;
     private boolean listObserved = false;
@@ -84,7 +84,7 @@ public boolean isSomeOtherBeanObserved() {
     public boolean isSomeTypedBeanObserved() {
         return someTypedBeanObserved;
     }
-    
+
     public void reset() {
         // set all booleans to false
         fooObserved = false;
@@ -95,28 +95,28 @@ public void reset() {
         someOtherBeanObserved = false;
         someTypedBeanObserved = false;
     }
-    
-    public void observeFoo (@Observes Foo foo) {
+
+    public void observeFoo(@Observes Foo foo) {
         fooObserved = true;
     }
-    
-    public void observeBar (@Observes @Dubious Bar bar) {
+
+    public void observeBar(@Observes @Dubious Bar bar) {
         barObserved = true;
     }
-    
-    public void observeList (@Observes List list) {
+
+    public void observeList(@Observes List list) {
         listObjectObserved = true;
     }
-    
-    public void observeListRaw (@Observes List list) {
+
+    public void observeListRaw(@Observes List list) {
         listObserved = true;
     }
-    
-    public void observeSomeInterface (@Observes SomeInterface some) {
+
+    public void observeSomeInterface(@Observes SomeInterface some) {
         someInterfaceObserved = true;
     }
-    
-    public void observeSomeBean (@Observes SomeOtherBean bean) {
+
+    public void observeSomeBean(@Observes SomeOtherBean bean) {
         someOtherBeanObserved = true;
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/WeldEventTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/WeldEventTest.java
index e0e18ecc42b..00eccbb7d2f 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/WeldEventTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/enhanced/WeldEventTest.java
@@ -46,7 +46,7 @@ public class WeldEventTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(WeldEventTest.class))
-            .addPackage(WeldEventTest.class.getPackage())).build();
+                .addPackage(WeldEventTest.class.getPackage())).build();
     }
 
     @Test
@@ -102,7 +102,7 @@ public void testEventObservability() {
 
             // WeldEvent -> WeldEvent -> fire(SomeOtherBean)
             observer.reset();
-            container.event().select(someInterfaceType).fire(container.select(SomeOtherBean.class).get());
+            container.event(). select(someInterfaceType).fire(container.select(SomeOtherBean.class).get());
             Assert.assertTrue(observer.isSomeInterfaceObserved());
             Assert.assertTrue(observer.isSomeOtherBeanObserved());
             Assert.assertFalse(observer.isSomeTypedBeanObserved());
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/mode/NotificationModeTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/mode/NotificationModeTest.java
index 9df5e6a9b1f..6cc9751560f 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/mode/NotificationModeTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/mode/NotificationModeTest.java
@@ -59,8 +59,10 @@ public class NotificationModeTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(NotificationModeTest.class))
-                .addPackage(NotificationModeTest.class.getPackage())).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(NotificationModeTest.class))
+                        .addPackage(NotificationModeTest.class.getPackage()))
+                .build();
     }
 
     @Test
@@ -91,7 +93,8 @@ public void testAsyncEventExecutedInDifferentThread() throws InterruptedExceptio
             BlockingQueue synchronizer = new LinkedBlockingQueue<>();
             Set threadNames = new CopyOnWriteArraySet<>();
             container.event().select(Message.class)
-                    .fireAsync(() -> threadNames.add(Thread.currentThread().getName()), WeldNotificationOptions.withParallelMode())
+                    .fireAsync(() -> threadNames.add(Thread.currentThread().getName()),
+                            WeldNotificationOptions.withParallelMode())
                     .thenAccept(synchronizer::add);
             Message message = synchronizer.poll(2, TimeUnit.SECONDS);
             assertNotNull(message);
@@ -124,7 +127,8 @@ public void testInvalidMode() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         try (WeldContainer container = createWeld()) {
             try {
-                container.event().select(Message.class).fireAsync(() -> latch.countDown(), NotificationOptions.of(WeldNotificationOptions.MODE, "unsupported"));
+                container.event().select(Message.class).fireAsync(() -> latch.countDown(),
+                        NotificationOptions.of(WeldNotificationOptions.MODE, "unsupported"));
                 fail("Notification should have failed ");
             } catch (IllegalArgumentException expected) {
             }
@@ -134,7 +138,8 @@ public void testInvalidMode() throws InterruptedException {
     }
 
     static WeldContainer createWeld() {
-        return new Weld().property(ConfigurationKey.EXECUTOR_THREAD_POOL_TYPE.get(), "FIXED").property(ConfigurationKey.EXECUTOR_THREAD_POOL_SIZE.get(), 3)
+        return new Weld().property(ConfigurationKey.EXECUTOR_THREAD_POOL_TYPE.get(), "FIXED")
+                .property(ConfigurationKey.EXECUTOR_THREAD_POOL_SIZE.get(), 3)
                 .initialize();
     }
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/IncompleteCustomExecutorServices.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/IncompleteCustomExecutorServices.java
index 294e868ccda..7a0a5da930d 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/IncompleteCustomExecutorServices.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/IncompleteCustomExecutorServices.java
@@ -32,7 +32,7 @@ public class IncompleteCustomExecutorServices extends AbstractExecutorServices {
     static final String PREFIX = "weld-worker-test";
 
     private final transient ExecutorService taskExecutor = Executors
-        .newSingleThreadExecutor(new DaemonThreadFactory(new ThreadGroup(DaemonThreadFactory.WELD_WORKERS), PREFIX));
+            .newSingleThreadExecutor(new DaemonThreadFactory(new ThreadGroup(DaemonThreadFactory.WELD_WORKERS), PREFIX));
 
     public ExecutorService getTaskExecutor() {
         return taskExecutor;
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/NotificationTimeoutTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/NotificationTimeoutTest.java
index 2a5f674f8dc..c369dbfb8f4 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/NotificationTimeoutTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/event/options/timeout/NotificationTimeoutTest.java
@@ -53,8 +53,11 @@ public class NotificationTimeoutTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(NotificationTimeoutTest.class))
-            .addPackage(NotificationTimeoutTest.class.getPackage()).addClass(IncompleteCustomExecutorServices.class)).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(NotificationTimeoutTest.class))
+                        .addPackage(NotificationTimeoutTest.class.getPackage())
+                        .addClass(IncompleteCustomExecutorServices.class))
+                .build();
     }
 
     @Test
@@ -64,13 +67,13 @@ public void testMultipleObserverNotificationTimeout() throws InterruptedExceptio
             BlockingQueue synchronizer = new LinkedBlockingQueue<>();
             CountDownLatch countdown = new CountDownLatch(2);
             container.event().select(CountDownLatch.class)
-                .fireAsync(countdown, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, 2000l))
-                .exceptionally((Throwable t) -> {
-                    // handle TimeoutException we got here
-                    SUCCESSION_OF_EVENTS.add("Timeout");
-                    synchronizer.add(t);
-                    return null;
-                });
+                    .fireAsync(countdown, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, 2000l))
+                    .exceptionally((Throwable t) -> {
+                        // handle TimeoutException we got here
+                        SUCCESSION_OF_EVENTS.add("Timeout");
+                        synchronizer.add(t);
+                        return null;
+                    });
             Throwable fromSynchronizer = synchronizer.poll(5, TimeUnit.SECONDS);
             Assert.assertNotNull(fromSynchronizer);
             Assert.assertTrue(fromSynchronizer.getCause().toString().contains(TimeoutException.class.getSimpleName()));
@@ -88,15 +91,15 @@ public void testMultipleObserverParallelNotificationTimeout() throws Interrupted
             BlockingQueue synchronizer = new LinkedBlockingQueue<>();
             CountDownLatch countdown = new CountDownLatch(2);
             NotificationOptions options = NotificationOptions.builder().set(WeldNotificationOptions.TIMEOUT, "2000")
-                .set(WeldNotificationOptions.MODE, WeldNotificationOptions.NotificationMode.PARALLEL).build();
+                    .set(WeldNotificationOptions.MODE, WeldNotificationOptions.NotificationMode.PARALLEL).build();
             container.event().select(CountDownLatch.class)
-                .fireAsync(countdown, options)
-                .exceptionally((Throwable t) -> {
-                    // handle TimeoutException we got here
-                    SUCCESSION_OF_EVENTS.add("Timeout");
-                    synchronizer.add(t);
-                    return null;
-                });
+                    .fireAsync(countdown, options)
+                    .exceptionally((Throwable t) -> {
+                        // handle TimeoutException we got here
+                        SUCCESSION_OF_EVENTS.add("Timeout");
+                        synchronizer.add(t);
+                        return null;
+                    });
             Throwable fromSynchronizer = synchronizer.poll(5, TimeUnit.SECONDS);
             Assert.assertNotNull(fromSynchronizer);
             Assert.assertTrue(fromSynchronizer.getCause().toString().contains(TimeoutException.class.getSimpleName()));
@@ -114,7 +117,7 @@ public void testBadTimeoutInputThrowsException() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         try (WeldContainer container = new Weld().initialize()) {
             container.event().select(CountDownLatch.class)
-                .fireAsync(latch, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, 1.2345));
+                    .fireAsync(latch, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, 1.2345));
             Assert.fail("Bad input valut should throw IllegalArgumentException.");
         } catch (IllegalArgumentException iae) {
             // expected, should throw IAE
@@ -133,12 +136,12 @@ public void testTimeoutNotReached() throws InterruptedException {
             BlockingQueue synchronizer = new LinkedBlockingQueue<>();
             CountDownLatch countdown = new CountDownLatch(1);
             container.event().select(CountDownLatch.class)
-                .fireAsync(countdown, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, new Long(2000l)))
-                .thenRun(() -> synchronizer.add(success))
-                .exceptionally((Throwable t) -> { // only executes if the notification ended with exception
-                    synchronizer.add("Exception");
-                    return null;
-                });
+                    .fireAsync(countdown, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, new Long(2000l)))
+                    .thenRun(() -> synchronizer.add(success))
+                    .exceptionally((Throwable t) -> { // only executes if the notification ended with exception
+                        synchronizer.add("Exception");
+                        return null;
+                    });
             // wait for the observer to finish the job
             countdown.await();
             // assert that BlockingQueue has exactly one item indicating success
@@ -158,12 +161,12 @@ public void testSingleObserverNotificationTimeout() throws InterruptedException
             BlockingQueue synchronizer = new LinkedBlockingQueue<>();
             CountDownLatch countdown = new CountDownLatch(1);
             container.event().select(CountDownLatch.class)
-                .fireAsync(countdown, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, new Long(1000l)))
-                .exceptionally((Throwable t) -> {
-                    SUCCESSION_OF_EVENTS.add("Timeout");
-                    synchronizer.add(t);
-                    return null;
-                });
+                    .fireAsync(countdown, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, new Long(1000l)))
+                    .exceptionally((Throwable t) -> {
+                        SUCCESSION_OF_EVENTS.add("Timeout");
+                        synchronizer.add(t);
+                        return null;
+                    });
             Throwable fromSynchronizer = synchronizer.poll(5, TimeUnit.SECONDS);
             Assert.assertNotNull(fromSynchronizer);
             Assert.assertTrue(fromSynchronizer.getCause().toString().contains(TimeoutException.class.getSimpleName()));
@@ -178,10 +181,12 @@ public void testSingleObserverNotificationTimeout() throws InterruptedException
     @Test(expected = UnsupportedOperationException.class)
     public void testCustomExecutorServiceNotImplementingTimerExecutor() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
-        Weld weld = new Weld().disableDiscovery().addBeanClasses(HardworkingObserver.class).addServices(new IncompleteCustomExecutorServices());
+        Weld weld = new Weld().disableDiscovery().addBeanClasses(HardworkingObserver.class)
+                .addServices(new IncompleteCustomExecutorServices());
         try (WeldContainer container = weld.initialize()) {
             try {
-                container.event().select(CountDownLatch.class).fireAsync(latch, NotificationOptions.of(WeldNotificationOptions.TIMEOUT, "2000"));
+                container.event().select(CountDownLatch.class).fireAsync(latch,
+                        NotificationOptions.of(WeldNotificationOptions.TIMEOUT, "2000"));
             } catch (IllegalArgumentException e) {
                 // expected, should throw IAE
                 Assert.assertFalse(latch.await(500, TimeUnit.MILLISECONDS));
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/BuildCompatibleExtensionSmokeTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/BuildCompatibleExtensionSmokeTest.java
index d3f6f462254..8587d2e66c6 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/BuildCompatibleExtensionSmokeTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/BuildCompatibleExtensionSmokeTest.java
@@ -19,6 +19,7 @@
 
 import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension;
 import jakarta.enterprise.inject.spi.Extension;
+
 import org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -40,9 +41,11 @@ public class BuildCompatibleExtensionSmokeTest {
 
     @Deployment
     public static Archive getDeployment() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(BuildCompatibleExtensionSmokeTest.class))
+        return ClassPath.builder().add(ShrinkWrap
+                .create(BeanArchive.class, Utils.getDeploymentNameAsHash(BuildCompatibleExtensionSmokeTest.class))
                 .addPackage(BuildCompatibleExtensionSmokeTest.class.getPackage())
-                .addAsServiceProvider(BuildCompatibleExtension.class, StandardBuildCompatibleExtension.class, OverridenBuildCompatibleExtension.class)
+                .addAsServiceProvider(BuildCompatibleExtension.class, StandardBuildCompatibleExtension.class,
+                        OverridenBuildCompatibleExtension.class)
                 .addAsServiceProvider(Extension.class, OverridingPortableExtension.class, StandardPortableExtension.class))
                 .build();
     }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/none/TestNoExtensionFound.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/none/TestNoExtensionFound.java
index ececf2f57cd..e2df25190dd 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/none/TestNoExtensionFound.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/extension/build/compatible/none/TestNoExtensionFound.java
@@ -17,10 +17,8 @@
 
 package org.jboss.weld.environment.se.test.extension.build.compatible.none;
 
-import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension;
-import jakarta.enterprise.inject.spi.CDI;
 import jakarta.enterprise.inject.spi.Extension;
-import jakarta.inject.Inject;
+
 import org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -44,9 +42,10 @@ public class TestNoExtensionFound {
 
     @Deployment
     public static Archive getDeployment() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(TestNoExtensionFound.class))
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(TestNoExtensionFound.class))
                         .addPackage(TestNoExtensionFound.class.getPackage()))
-                        .build();
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSmokeTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSmokeTest.java
index de67f699700..227d840d67b 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSmokeTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSmokeTest.java
@@ -44,7 +44,8 @@ public static Archive createTestArchive() {
 
     @Test
     public void testDiscovery() {
-        try (WeldContainer container = new Weld().property(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, Boolean.TRUE).initialize()) {
+        try (WeldContainer container = new Weld().property(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, Boolean.TRUE)
+                .initialize()) {
             Foo foo = container.select(Foo.class).get();
             assertNotNull(foo);
             assertEquals(1, foo.ping());
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSystemPropertySmokeTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSystemPropertySmokeTest.java
index c38179677f1..cc390e564ea 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSystemPropertySmokeTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/ImplicitScanSystemPropertySmokeTest.java
@@ -42,9 +42,12 @@ public class ImplicitScanSystemPropertySmokeTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        final JavaArchive bda1 = ShrinkWrap.create(JavaArchive.class).addClasses(Foo.class, Bar.class).addAsManifestResource(new BeansXml(), "beans.xml");
-        final JavaArchive bda2 = ShrinkWrap.create(JavaArchive.class).addClasses(ImplicitScanSystemPropertySmokeTest.class, Baz.class);
-        return ClassPath.builder().add(bda1).add(bda2).addSystemProperty(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, "true").build();
+        final JavaArchive bda1 = ShrinkWrap.create(JavaArchive.class).addClasses(Foo.class, Bar.class)
+                .addAsManifestResource(new BeansXml(), "beans.xml");
+        final JavaArchive bda2 = ShrinkWrap.create(JavaArchive.class).addClasses(ImplicitScanSystemPropertySmokeTest.class,
+                Baz.class);
+        return ClassPath.builder().add(bda1).add(bda2).addSystemProperty(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, "true")
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/directory/ImplicitScanBeanArchiveDirectoryTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/directory/ImplicitScanBeanArchiveDirectoryTest.java
index 47e80826426..fb774c4f0f3 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/directory/ImplicitScanBeanArchiveDirectoryTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/directory/ImplicitScanBeanArchiveDirectoryTest.java
@@ -35,7 +35,9 @@ public class ImplicitScanBeanArchiveDirectoryTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(ImplicitScanBeanArchiveDirectoryTest.class)).addDirectory("alpha-dir")
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addClasses(ImplicitScanBeanArchiveDirectoryTest.class))
+                .addDirectory("alpha-dir")
                 .addClass(AlphaFromDirectory.class).buildAndUp().build();
     }
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/disabled/ImplicitScanDisabledTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/disabled/ImplicitScanDisabledTest.java
index b588559e89c..484c3795c04 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/disabled/ImplicitScanDisabledTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/disabled/ImplicitScanDisabledTest.java
@@ -37,13 +37,15 @@ public class ImplicitScanDisabledTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(ImplicitScanDisabledTest.class, Bravo.class))
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addClasses(ImplicitScanDisabledTest.class, Bravo.class))
                 .add(ShrinkWrap.create(JavaArchive.class).addClasses(Alpha.class)).build();
     }
 
     @Test
     public void testDiscovery() {
-        try (WeldContainer container = new Weld().property(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, Boolean.FALSE).initialize()) {
+        try (WeldContainer container = new Weld().property(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, Boolean.FALSE)
+                .initialize()) {
             // Beans from an implicit bean archive with no beans.xml file are not registered
             assertTrue(container.select(Alpha.class).isUnsatisfied());
             Bravo bravo = container.select(Bravo.class).get();
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/discovery/none/ImplicitScanBeanDiscoveryModeNoneTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/discovery/none/ImplicitScanBeanDiscoveryModeNoneTest.java
index 076510fcc82..e7c43da0a93 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/discovery/none/ImplicitScanBeanDiscoveryModeNoneTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/implicit/discovery/none/ImplicitScanBeanDiscoveryModeNoneTest.java
@@ -39,13 +39,16 @@ public class ImplicitScanBeanDiscoveryModeNoneTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder()
-                .add(ShrinkWrap.create(JavaArchive.class).addClasses(Bong.class).addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE), "beans.xml"))
-                .add(ShrinkWrap.create(JavaArchive.class).addClasses(ImplicitScanBeanDiscoveryModeNoneTest.class, Bang.class)).build();
+                .add(ShrinkWrap.create(JavaArchive.class).addClasses(Bong.class)
+                        .addAsManifestResource(new BeansXml(BeanDiscoveryMode.NONE), "beans.xml"))
+                .add(ShrinkWrap.create(JavaArchive.class).addClasses(ImplicitScanBeanDiscoveryModeNoneTest.class, Bang.class))
+                .build();
     }
 
     @Test
     public void testDiscovery() {
-        try (WeldContainer container = new Weld().property(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, Boolean.TRUE).initialize()) {
+        try (WeldContainer container = new Weld().property(Weld.JAVAX_ENTERPRISE_INJECT_SCAN_IMPLICIT, Boolean.TRUE)
+                .initialize()) {
             assertTrue(container.select(Bong.class).isUnsatisfied());
             Bang bang = container.select(Bang.class).get();
             assertNotNull(bang);
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Bravo.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Bravo.java
index c9918c78a08..6b65d04a934 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Bravo.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Bravo.java
@@ -26,4 +26,3 @@
 public class Bravo extends Base {
 
 }
-
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/FirstProcessor.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/FirstProcessor.java
index 29aba6ea12f..ba8ab2f2daf 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/FirstProcessor.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/FirstProcessor.java
@@ -17,8 +17,8 @@
 package org.jboss.weld.environment.se.test.instance.enhanced;
 
 import jakarta.annotation.PreDestroy;
-
 import jakarta.enterprise.context.Dependent;
+
 import org.jboss.weld.test.util.ActionSequence;
 
 /**
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/InstanceHandleTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/InstanceHandleTest.java
index 3ca750fafef..52c59dfd9b4 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/InstanceHandleTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/InstanceHandleTest.java
@@ -23,9 +23,14 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.math.BigDecimal;
+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 org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -40,10 +45,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.math.BigDecimal;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Similar to {@link WeldInstanceTest} but uses purely CDI APIs
  *
@@ -54,8 +55,10 @@ public class InstanceHandleTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(InstanceHandleTest.class))
-                .addPackage(InstanceHandleTest.class.getPackage()).addClass(ActionSequence.class)).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(InstanceHandleTest.class))
+                        .addPackage(InstanceHandleTest.class.getPackage()).addClass(ActionSequence.class))
+                .build();
     }
 
     @Test
@@ -160,7 +163,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();
                 }
@@ -176,7 +179,8 @@ public void testHandlesStream() {
         ActionSequence.reset();
         try (WeldContainer container = new Weld().initialize()) {
 
-            Instance.Handle processor = container.select(Processor.class).handlesStream().filter(h -> Dependent.class.equals(h.getBean().getScope()))
+            Instance.Handle processor = container.select(Processor.class).handlesStream()
+                    .filter(h -> Dependent.class.equals(h.getBean().getScope()))
                     .findFirst().orElse(null);
             assertNull(ActionSequence.getSequenceData());
             assertNotNull(processor);
@@ -187,7 +191,8 @@ public void testHandlesStream() {
             assertEquals(1, sequence.size());
             assertEquals("firstDestroy", sequence.get(0));
 
-            Instance.Handle withPriority = container.select(WithPriority.class).handlesStream().sorted(container.getHandlePriorityComparator()).findFirst()
+            Instance.Handle withPriority = container.select(WithPriority.class).handlesStream()
+                    .sorted(container.getHandlePriorityComparator()).findFirst()
                     .orElse(null);
             assertNotNull(withPriority);
             assertEquals(Priority3.class, withPriority.getBean().getBeanClass());
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Priority1.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Priority1.java
index 43d1f73c5e5..b6e011d0f15 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Priority1.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/Priority1.java
@@ -26,7 +26,6 @@
 @Priority(1)
 public class Priority1 extends Base implements WithPriority {
 
-
     @Override
     String getId() {
         return Priority1.class.getName();
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldClient.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldClient.java
index 98963dcad0d..c472ffa91ba 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldClient.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldClient.java
@@ -17,11 +17,12 @@
 
 package org.jboss.weld.environment.se.test.instance.enhanced;
 
+import java.math.BigDecimal;
+
 import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
-import org.jboss.weld.inject.WeldInstance;
 
-import java.math.BigDecimal;
+import org.jboss.weld.inject.WeldInstance;
 
 @Dependent
 public class WeldClient {
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldInstanceTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldInstanceTest.java
index 6604891e1bb..5528be46df7 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldInstanceTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/WeldInstanceTest.java
@@ -22,8 +22,13 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.List;
+
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.spi.Bean;
+
 import org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -40,10 +45,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.math.BigDecimal;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * @author Matej Novotny
  * @author Martin Kouba
@@ -53,8 +54,10 @@ public class WeldInstanceTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(WeldInstanceTest.class))
-                .addPackage(WeldInstanceTest.class.getPackage()).addClass(ActionSequence.class)).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(WeldInstanceTest.class))
+                        .addPackage(WeldInstanceTest.class.getPackage()).addClass(ActionSequence.class))
+                .build();
     }
 
     @Test
@@ -159,7 +162,7 @@ public void testHandlers() {
 
             ActionSequence.reset();
             assertTrue(instance.isAmbiguous());
-            for (Iterator> iterator = instance.handlers().iterator(); iterator.hasNext(); ) {
+            for (Iterator> iterator = instance.handlers().iterator(); iterator.hasNext();) {
                 try (Handler handler = iterator.next()) {
                     handler.get().ping();
                 }
@@ -175,7 +178,8 @@ public void testHandlersStream() {
         ActionSequence.reset();
         try (WeldContainer container = new Weld().initialize()) {
 
-            Handler processor = container.select(Processor.class).handlersStream().filter(h -> Dependent.class.equals(h.getBean().getScope()))
+            Handler processor = container.select(Processor.class).handlersStream()
+                    .filter(h -> Dependent.class.equals(h.getBean().getScope()))
                     .findFirst().orElse(null);
             assertNull(ActionSequence.getSequenceData());
             assertNotNull(processor);
@@ -186,7 +190,8 @@ public void testHandlersStream() {
             assertEquals(1, sequence.size());
             assertEquals("firstDestroy", sequence.get(0));
 
-            Handler withPriority = container.select(WithPriority.class).handlersStream().sorted(container.getPriorityComparator()).findFirst()
+            Handler withPriority = container.select(WithPriority.class).handlersStream()
+                    .sorted(container.getPriorityComparator()).findFirst()
                     .orElse(null);
             assertNotNull(withPriority);
             assertEquals(Priority3.class, withPriority.getBean().getBeanClass());
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Bar.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Bar.java
index 269b3b44cdb..37872c63e23 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Bar.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Bar.java
@@ -24,5 +24,5 @@
  */
 @Vetoed
 public class Bar {
-    
+
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Foo.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Foo.java
index dede42fc3d8..cd2e1256968 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Foo.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/Foo.java
@@ -24,6 +24,5 @@
  */
 @Dependent
 public class Foo {
-    
-    
+
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/TypedBean.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/TypedBean.java
index 7d0f043aeea..d9ea0f8ff5b 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/TypedBean.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/TypedBean.java
@@ -24,7 +24,7 @@
  * @author Matej Novotny
  */
 @ApplicationScoped
-@Typed({SomeOtherBean.class, TypedBean.class})
+@Typed({ SomeOtherBean.class, TypedBean.class })
 public class TypedBean extends SomeOtherBean {
-    
+
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/WeldInstanceSelectTypeTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/WeldInstanceSelectTypeTest.java
index 31f4d53c51f..59de3d90de1 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/WeldInstanceSelectTypeTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/instance/enhanced/selectType/WeldInstanceSelectTypeTest.java
@@ -45,8 +45,10 @@ public class WeldInstanceSelectTypeTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(WeldInstanceSelectTypeTest.class))
-            .addPackage(WeldInstanceSelectTypeTest.class.getPackage())).build();
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(WeldInstanceSelectTypeTest.class))
+                        .addPackage(WeldInstanceSelectTypeTest.class.getPackage()))
+                .build();
     }
 
     @Test
@@ -55,7 +57,8 @@ public void testValidSelect() {
             // Class implements Type, so let's make use of that
             Type firstType = SomeInterface.class;
             // Let's also grab a parameterized type
-            ParameterizedType pType = (ParameterizedType) new TypeLiteral>() {}.getType();
+            ParameterizedType pType = (ParameterizedType) new TypeLiteral>() {
+            }.getType();
 
             // Instance -> Instance
             WeldInstance instanceObject = container.select(firstType);
@@ -66,7 +69,7 @@ public void testValidSelect() {
             SomeInterface si = (SomeInterface) object;
             Assert.assertEquals(SomeOtherBean.class.getSimpleName(), si.ping());
 
-            WeldInstance> parameterizedInstance = container.>select(pType);
+            WeldInstance> parameterizedInstance = container.> select(pType);
             Foo fooBar = parameterizedInstance.get();
             Assert.assertNotNull(fooBar);
         }
@@ -87,23 +90,23 @@ public void testInvalidSelect() {
             }
         }
     }
-    
+
     @Test
     public void testSelectOnTypedBean() {
         // typed bean has no Object type, from bean selection perspective, it isn't hierarchical select from WeldInstance
         Type type = TypedBean.class;
         try (WeldContainer container = new Weld().initialize()) {
             // should work
-            TypedBean bean = container.select(type).get();
+            TypedBean bean = container. select(type).get();
             Assert.assertNotNull(bean);
         }
     }
-    
+
     @Test
     public void testDestroy() {
         Type type = DestroyedBean.class;
         try (WeldContainer container = new Weld().initialize()) {
-            WeldInstance instance = container.select(type);
+            WeldInstance instance = container. select(type);
             DestroyedBean bean = instance.get();
             Assert.assertNotNull(bean);
             // destroy and verify
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/EEResourceInjectionIgnoredTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/EEResourceInjectionIgnoredTest.java
index a4d38198589..e17b1677126 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/EEResourceInjectionIgnoredTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/EEResourceInjectionIgnoredTest.java
@@ -40,7 +40,9 @@ public class EEResourceInjectionIgnoredTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(EEResourceInjectionIgnoredTest.class, Golf.class, Delta.class)).build();
+        return ClassPath.builder().add(
+                ShrinkWrap.create(BeanArchive.class).addClasses(EEResourceInjectionIgnoredTest.class, Golf.class, Delta.class))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/Golf.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/Golf.java
index 3d7e965a143..01c13d86455 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/Golf.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/resource/Golf.java
@@ -27,7 +27,7 @@ public class Golf {
     @Inject
     Delta delta;
 
-    @PersistenceContext(unitName="myDb")
+    @PersistenceContext(unitName = "myDb")
     EntityManager entityManager;
 
     public Delta getDelta() {
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitClassLoaderExtensionScanningTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitClassLoaderExtensionScanningTest.java
index c616a7b1453..01daa4191ac 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitClassLoaderExtensionScanningTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitClassLoaderExtensionScanningTest.java
@@ -43,9 +43,11 @@ public class ExplicitClassLoaderExtensionScanningTest {
     @Deployment
     public static Archive createTestArchive() {
         final JavaArchive bda1 = ShrinkWrap.create(JavaArchive.class)
-                .addClasses(ExplicitClassLoaderExtensionScanningTest.class, MyExtension.class, Alpha.class, Bravo.class, AlphaExtension.class,
+                .addClasses(ExplicitClassLoaderExtensionScanningTest.class, MyExtension.class, Alpha.class, Bravo.class,
+                        AlphaExtension.class,
                         BravoExtension.class, DummyBean.class)
-                .addAsManifestResource(new BeansXml(), "beans.xml").addAsServiceProvider(Extension.class, AlphaExtension.class, BravoExtension.class)
+                .addAsManifestResource(new BeansXml(), "beans.xml")
+                .addAsServiceProvider(Extension.class, AlphaExtension.class, BravoExtension.class)
                 .addAsServiceProvider(MyExtension.class, AlphaExtension.class);
         return ClassPath.builder().add(bda1).build();
     }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitResourceLoaderExtensionScanningTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitResourceLoaderExtensionScanningTest.java
index 39d1a113ca6..1b4a1af866c 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitResourceLoaderExtensionScanningTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/scanning/ExplicitResourceLoaderExtensionScanningTest.java
@@ -44,9 +44,11 @@ public class ExplicitResourceLoaderExtensionScanningTest {
     @Deployment
     public static Archive createTestArchive() {
         final JavaArchive bda1 = ShrinkWrap.create(JavaArchive.class)
-                .addClasses(ExplicitResourceLoaderExtensionScanningTest.class, MyExtension.class, Alpha.class, Bravo.class, AlphaExtension.class,
+                .addClasses(ExplicitResourceLoaderExtensionScanningTest.class, MyExtension.class, Alpha.class, Bravo.class,
+                        AlphaExtension.class,
                         BravoExtension.class, DummyBean.class)
-                .addAsManifestResource(new BeansXml(), "beans.xml").addAsServiceProvider(Extension.class, AlphaExtension.class, BravoExtension.class)
+                .addAsManifestResource(new BeansXml(), "beans.xml")
+                .addAsServiceProvider(Extension.class, AlphaExtension.class, BravoExtension.class)
                 .addAsServiceProvider(MyExtension.class, AlphaExtension.class);
         return ClassPath.builder().add(bda1).build();
     }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/AdditionalServiceTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/AdditionalServiceTest.java
index 632f9af2b83..f2e3a81afce 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/AdditionalServiceTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/AdditionalServiceTest.java
@@ -52,17 +52,18 @@ public class AdditionalServiceTest {
     public static Archive createTestArchive() {
         @SuppressWarnings("rawtypes")
         Class[] classes = new Class[] {
-            AdditionalServiceTest.class,
-            AlphaImpl.class,
-            AlphaService.class,
-            Bravo1Service.class,
-            Bravo2Service.class,
-            BravoImpl.class,
-            ExecutorServices1.class,
-            ExecutorServices2.class,
-            DummyBean.class
+                AdditionalServiceTest.class,
+                AlphaImpl.class,
+                AlphaService.class,
+                Bravo1Service.class,
+                Bravo2Service.class,
+                BravoImpl.class,
+                ExecutorServices1.class,
+                ExecutorServices2.class,
+                DummyBean.class
         };
-        final JavaArchive bda1 = ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(AdditionalServiceTest.class, Utils.ARCHIVE_TYPE.WAR))
+        final JavaArchive bda1 = ShrinkWrap
+                .create(BeanArchive.class, Utils.getDeploymentNameAsHash(AdditionalServiceTest.class, Utils.ARCHIVE_TYPE.WAR))
                 .addClasses(classes).addAsServiceProvider(Service.class, ExecutorServices1.class);
         return ClassPath.builder().add(bda1).build();
     }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/ExecutorServices1.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/ExecutorServices1.java
index 95cfda6cbe4..3898374e0d3 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/ExecutorServices1.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/ExecutorServices1.java
@@ -49,5 +49,4 @@ public  List> invokeAllAndCheckForExceptions(TaskFactory factory
         return null;
     }
 
-
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/executorService/ContextClassLoaderNullifiedTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/executorService/ContextClassLoaderNullifiedTest.java
index 46cddb8b28a..c08408eb3d6 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/executorService/ContextClassLoaderNullifiedTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/service/executorService/ContextClassLoaderNullifiedTest.java
@@ -41,7 +41,8 @@
 import org.junit.runner.RunWith;
 
 /**
- * Tests that TCCL is set to null when running in SE with enabled discovery (in which case we use ForkJoinPool and hence CommonForkJoinPoolExecutorServices)
+ * Tests that TCCL is set to null when running in SE with enabled discovery (in which case we use ForkJoinPool and hence
+ * CommonForkJoinPoolExecutorServices)
  *
  * @see WELD-2494
  * @author Matej Novotny
@@ -52,18 +53,19 @@ public class ContextClassLoaderNullifiedTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class)
-            .addClasses(ContextClassLoaderNullifiedTest.class, DummyBean.class))
-            .build();
+                .addClasses(ContextClassLoaderNullifiedTest.class, DummyBean.class))
+                .build();
     }
 
     @Test
     public void testTcclNullifiedInSeEnvironment() {
         Weld weld = new Weld()
-            // in case default changes, make sure this tests uses ForkJoinPool
-            .addProperty(ConfigurationKey.EXECUTOR_THREAD_POOL_TYPE.toString(), ExecutorServicesFactory.ThreadPoolType.COMMON.toString());
+                // in case default changes, make sure this tests uses ForkJoinPool
+                .addProperty(ConfigurationKey.EXECUTOR_THREAD_POOL_TYPE.toString(),
+                        ExecutorServicesFactory.ThreadPoolType.COMMON.toString());
         try (WeldContainer container = weld.initialize()) {
             AtomicBoolean isTCCLNull = new AtomicBoolean(false);
-            
+
             // retrieve service and use it to invoke Callable
             ServiceRegistry registry = BeanManagerProxy.unwrap(container.getBeanManager()).getServices();
             ExecutorServices es = registry.get(ExecutorServices.class);
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/AbstractShutdownHookTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/AbstractShutdownHookTest.java
index 067145bba17..3a82c3e01cf 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/AbstractShutdownHookTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/AbstractShutdownHookTest.java
@@ -44,7 +44,8 @@ public void deploy() throws Exception {
         Foo.IS_FOO_DESTROYED.set(false);
         // Start embedded undertow to collect test results
         // We need to use reflection because ShutdownHookTest is a part of the test archive and testFooPing() is called in-container
-        ShutdownHookTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS).getDeclaredMethod("start").invoke(null);
+        ShutdownHookTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS).getDeclaredMethod("start")
+                .invoke(null);
         // Deploy the test archive - start SE app
         deployer.deploy(DEPLOYMENT_NAME);
     }
@@ -67,7 +68,8 @@ public void undeploy() throws Exception {
             assertTrue(Foo.IS_FOO_DESTROYED.get());
         } finally {
             // Stop embedded undertow
-            ShutdownHookTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS).getDeclaredMethod("stop").invoke(null);
+            ShutdownHookTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS).getDeclaredMethod("stop")
+                    .invoke(null);
         }
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/Observer.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/Observer.java
index afd61dc2a9a..4bedbee4689 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/Observer.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/Observer.java
@@ -28,10 +28,10 @@
  */
 @Dependent
 public class Observer {
-    
+
     @Inject
     Foo foo;
-    
+
     public void observeInit(@Observes @Initialized(ApplicationScoped.class) Object payload) {
         // we need to use the bean here, to trigger initialization (and, later on, @PreDestroy)
         foo.ping();
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredBuilderTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredBuilderTest.java
index 7f412eca2c0..673be081f8f 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredBuilderTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredBuilderTest.java
@@ -36,7 +36,8 @@ public class ShutdownHookNotRegisteredBuilderTest extends ShutdownHookNotRegiste
     @Deployment(managed = false, name = DEPLOYMENT_NAME)
     public static Archive createTestArchive() {
         return ClassPath.builder().add(
-                ShrinkWrap.create(BeanArchive.class).addClasses(ShutdownHookNotRegisteredTest.class, ShutdownHookNotRegisteredBuilderTest.class, Foo.class))
+                ShrinkWrap.create(BeanArchive.class).addClasses(ShutdownHookNotRegisteredTest.class,
+                        ShutdownHookNotRegisteredBuilderTest.class, Foo.class))
                 .build();
     }
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredSystemPropertyTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredSystemPropertyTest.java
index d73237fbd2b..680f3e83cf2 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredSystemPropertyTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredSystemPropertyTest.java
@@ -35,7 +35,9 @@ public class ShutdownHookNotRegisteredSystemPropertyTest extends ShutdownHookNot
 
     @Deployment(managed = false, name = DEPLOYMENT_NAME)
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(ShutdownHookNotRegisteredTest.class, ShutdownHookNotRegisteredSystemPropertyTest.class, Foo.class))
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addClasses(ShutdownHookNotRegisteredTest.class,
+                        ShutdownHookNotRegisteredSystemPropertyTest.class, Foo.class))
                 .addSystemProperty(Weld.SHUTDOWN_HOOK_SYSTEM_PROPERTY, "false").build();
     }
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredTest.java
index 083c35aabf6..b784856b3f0 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookNotRegisteredTest.java
@@ -46,7 +46,8 @@ public void deploy() throws Exception {
         // Start embedded undertow to collect test results
         // We need to use reflection because ShutdownHookTest is a part of the
         // test archive and testFooPing() is called in-container
-        ShutdownHookNotRegisteredTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS).getDeclaredMethod("start").invoke(null);
+        ShutdownHookNotRegisteredTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS)
+                .getDeclaredMethod("start").invoke(null);
         // Deploy the test archive - start SE app
         deployer.deploy(DEPLOYMENT_NAME);
     }
@@ -71,7 +72,8 @@ public void undeploy() throws Exception {
             assertFalse(Foo.IS_FOO_DESTROYED.get());
         } finally {
             // Stop embedded undertow
-            ShutdownHookNotRegisteredTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS).getDeclaredMethod("stop").invoke(null);
+            ShutdownHookNotRegisteredTest.class.getClassLoader().loadClass(Foo.UNDERTOW_TEST_SERVER_CLASS)
+                    .getDeclaredMethod("stop").invoke(null);
         }
     }
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookRegisteredBeforeInitEventTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookRegisteredBeforeInitEventTest.java
index 210db55ea63..2fb048a5c61 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookRegisteredBeforeInitEventTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookRegisteredBeforeInitEventTest.java
@@ -47,7 +47,7 @@ public class ShutdownHookRegisteredBeforeInitEventTest extends AbstractShutdownH
     @Deployment(managed = false, name = DEPLOYMENT_NAME)
     public static Archive createTestArchive() {
         return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(AbstractShutdownHookTest.class,
-            ShutdownHookRegisteredBeforeInitEventTest.class, Foo.class, Observer.class)).build();
+                ShutdownHookRegisteredBeforeInitEventTest.class, Foo.class, Observer.class)).build();
     }
 
     @RunAsClient
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookTest.java
index b3a794eae4d..615d822abf1 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/ShutdownHookTest.java
@@ -36,6 +36,6 @@ public class ShutdownHookTest extends AbstractShutdownHookTest {
     @Deployment(managed = false, name = DEPLOYMENT_NAME)
     public static Archive createTestArchive() {
         return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(AbstractShutdownHookTest.class,
-            ShutdownHookTest.class, Foo.class)).build();
+                ShutdownHookTest.class, Foo.class)).build();
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/UndertowTestServer.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/UndertowTestServer.java
index 4f9901ff807..015e30f589f 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/UndertowTestServer.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/shutdown/hook/UndertowTestServer.java
@@ -16,13 +16,14 @@
  */
 package org.jboss.weld.environment.se.test.shutdown.hook;
 
+import java.net.BindException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-
-import java.net.BindException;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 class UndertowTestServer {
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/SyntheticBeanArchiveFromDirectoryTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/SyntheticBeanArchiveFromDirectoryTest.java
index fd92d0acd04..4e7abcab55c 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/SyntheticBeanArchiveFromDirectoryTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/SyntheticBeanArchiveFromDirectoryTest.java
@@ -41,7 +41,9 @@ public class SyntheticBeanArchiveFromDirectoryTest {
 
     @Deployment
     public static Archive createTestArchive() {
-        return ClassPath.builder().add(ShrinkWrap.create(BeanArchive.class).addClasses(SyntheticBeanArchiveFromDirectoryTest.class)).addDirectory("alpha-dir")
+        return ClassPath.builder()
+                .add(ShrinkWrap.create(BeanArchive.class).addClasses(SyntheticBeanArchiveFromDirectoryTest.class))
+                .addDirectory("alpha-dir")
                 .addClass(AlphaFromDirectory.class).addClass(BetaFromDirectory.class)
                 .buildAndUp().build();
     }
@@ -64,7 +66,7 @@ public void testAddPackageFromDirectory() {
     public void testAddPackageFromDirectoryRecursively() {
         try (WeldContainer container = new Weld()
                 .disableDiscovery()
-                .addPackages(true,AlphaFromDirectory.class.getPackage())
+                .addPackages(true, AlphaFromDirectory.class.getPackage())
                 .initialize()) {
             AlphaFromDirectory alpha = container.select(AlphaFromDirectory.class).get();
             Instance betaInstance = container.select(BetaFromDirectory.class);
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/SyntheticArchiveWithPackageFromJarTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/SyntheticArchiveWithPackageFromJarTest.java
index 7fd4de224bb..140734694b8 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/SyntheticArchiveWithPackageFromJarTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/SyntheticArchiveWithPackageFromJarTest.java
@@ -16,6 +16,9 @@
  */
 package org.jboss.weld.environment.se.test.synthethic.jarHandling;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.jboss.arquillian.container.se.api.ClassPath;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -31,9 +34,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 @RunWith(Arquillian.class)
 public class SyntheticArchiveWithPackageFromJarTest {
 
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foo/ImplOne.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foo/ImplOne.java
index 898593ecbe8..e0e26d731fd 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foo/ImplOne.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foo/ImplOne.java
@@ -18,6 +18,7 @@
 package org.jboss.weld.environment.se.test.synthethic.jarHandling.foo;
 
 import jakarta.enterprise.context.Dependent;
+
 import org.jboss.weld.environment.se.test.synthethic.jarHandling.SomeInterface;
 
 @Dependent
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foobar/ImplTwo.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foobar/ImplTwo.java
index e5007fc2c9c..8430c15e423 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foobar/ImplTwo.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/jarHandling/foobar/ImplTwo.java
@@ -18,6 +18,7 @@
 package org.jboss.weld.environment.se.test.synthethic.jarHandling.foobar;
 
 import jakarta.enterprise.context.Dependent;
+
 import org.jboss.weld.environment.se.test.synthethic.jarHandling.SomeInterface;
 
 @Dependent
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/AlphaFromDirectory.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/AlphaFromDirectory.java
index 7a84bcc3fa6..d1175f09b42 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/AlphaFromDirectory.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/AlphaFromDirectory.java
@@ -21,7 +21,7 @@
 @Dependent
 public class AlphaFromDirectory {
 
-    public int ping(){
+    public int ping() {
         return 1;
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/nested/BetaFromDirectory.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/nested/BetaFromDirectory.java
index 7f4117dc89f..aa09600e7e6 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/nested/BetaFromDirectory.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/synthethic/testpackage/nested/BetaFromDirectory.java
@@ -21,7 +21,7 @@
 @Dependent
 public class BetaFromDirectory {
 
-    public int ping(){
+    public int ping() {
         return 1;
     }
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/contextActive/IsContextActiveTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/contextActive/IsContextActiveTest.java
index b37b9053845..8426f2acd63 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/contextActive/IsContextActiveTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/contextActive/IsContextActiveTest.java
@@ -45,8 +45,9 @@ public class IsContextActiveTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder()
-            .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(IsContextActiveTest.class))
-                .addClasses(IsContextActiveTest.class, TheLoneBean.class)).build();
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(IsContextActiveTest.class))
+                        .addClasses(IsContextActiveTest.class, TheLoneBean.class))
+                .build();
     }
 
     @Test
@@ -54,7 +55,7 @@ public void assertContextState() {
         try (WeldContainer container = new Weld().initialize()) {
             // TheLoneBean is just to have some bean in the archive
             container.select(TheLoneBean.class).get().ping();
-            
+
             WeldManager manager = container.select(WeldManager.class).get();
             // app scoped context is always active whereas session scoped in SE is not
             Assert.assertTrue(manager.isContextActive(ApplicationScoped.class));
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/getContexts/GetContextUtilMethodsTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/getContexts/GetContextUtilMethodsTest.java
index d5133c51467..d50ea6f9b59 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/getContexts/GetContextUtilMethodsTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/getContexts/GetContextUtilMethodsTest.java
@@ -57,8 +57,9 @@ public class GetContextUtilMethodsTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder()
-            .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(GetContextUtilMethodsTest.class))
-                .addClasses(GetContextUtilMethodsTest.class, TheLoneBean.class)).build();
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(GetContextUtilMethodsTest.class))
+                        .addClasses(GetContextUtilMethodsTest.class, TheLoneBean.class))
+                .build();
     }
 
     @Test
@@ -72,7 +73,8 @@ public void getActiveContextsTest() {
             // it is dependent, singleton and application
             Collection activeContexts = manager.getActiveContexts();
             Assert.assertEquals(3, activeContexts.size());
-            Set> scopes = activeContexts.stream().map(t -> t.getScope()).collect(Collectors.toSet());
+            Set> scopes = activeContexts.stream().map(t -> t.getScope())
+                    .collect(Collectors.toSet());
             Assert.assertTrue(scopes.contains(Dependent.class));
             Assert.assertTrue(scopes.contains(Singleton.class));
             Assert.assertTrue(scopes.contains(ApplicationScoped.class));
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/InjectWeldManagerTest.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/InjectWeldManagerTest.java
index 075212f0e8c..618e281cff9 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/InjectWeldManagerTest.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/InjectWeldManagerTest.java
@@ -47,8 +47,9 @@ public class InjectWeldManagerTest {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder()
-            .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(InjectWeldManagerTest.class))
-                .addClasses(InjectWeldManagerTest.class, SomeBean.class)).build();
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(InjectWeldManagerTest.class))
+                        .addClasses(InjectWeldManagerTest.class, SomeBean.class))
+                .build();
     }
 
     @Test
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/SomeBean.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/SomeBean.java
index 6f3812e3603..5fb390e4222 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/SomeBean.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/injectable/SomeBean.java
@@ -24,5 +24,5 @@
  */
 @ApplicationScoped
 public class SomeBean {
-    
+
 }
diff --git a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/scopes/GetScopesTests.java b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/scopes/GetScopesTests.java
index 51843792ba5..d455fe7e858 100644
--- a/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/scopes/GetScopesTests.java
+++ b/environments/se/tests/src/test/java/org/jboss/weld/environment/se/test/weldManager/scopes/GetScopesTests.java
@@ -45,8 +45,9 @@ public class GetScopesTests {
     @Deployment
     public static Archive createTestArchive() {
         return ClassPath.builder()
-            .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(GetScopesTests.class))
-                .addClasses(GetScopesTests.class, TheLoneBean.class)).build();
+                .add(ShrinkWrap.create(BeanArchive.class, Utils.getDeploymentNameAsHash(GetScopesTests.class))
+                        .addClasses(GetScopesTests.class, TheLoneBean.class))
+                .build();
     }
 
     @Test
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java
index 3a7cf52d222..73fbe4c3442 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyContainer.java
@@ -26,17 +26,21 @@
 
 /**
  * Jetty Container.
- * 
    This container requires that the jetty server register DecoratingListener
+ * 
    
+ * This container requires that the jetty server register DecoratingListener
  * to dynamically register a decorator instance that wraps the {@link WeldDecorator}
- * added as an attribute.   The jetty decorate module does this and indicates it's
+ * added as an attribute. The jetty decorate module does this and indicates it's
  * availability by setting the "org.eclipse.jetty.webapp.DecoratingListener" to the
- * name of the watched attribute.
    
+ * name of the watched attribute.
+ * 
    
  *
- * 
    Jetty also provides the cdi-spi module that may directly invoke the
- * CDI SPI.  This module indicates it's availability by setting the "org.eclipse.jetty.cdi"
- * context attribute to "CdiDecorator".  If this module is used, then this JettyContainer
+ * 
    
+ * Jetty also provides the cdi-spi module that may directly invoke the
+ * CDI SPI. This module indicates it's availability by setting the "org.eclipse.jetty.cdi"
+ * context attribute to "CdiDecorator". If this module is used, then this JettyContainer
  * only logs a message and does no further integration.
  * 
    
+ *
  * @since Jetty 9.4.20
  * @see JettyLegacyContainer
  * @author Greg Wilkins
@@ -62,14 +66,14 @@ public boolean touch(ResourceLoader resourceLoader, ContainerContext context) th
         // DecoratingListener is registered. Weld-3.1.2.Final documented that the decorate module
         // could be used directly, which sets DECORATING_LISTENER_ATTRIBUTE
         return servletContext.getAttribute(JETTY_CDI_ATTRIBUTE) instanceof String ||
-            servletContext.getAttribute(DECORATING_LISTENER_ATTRIBUTE) instanceof String;
+                servletContext.getAttribute(DECORATING_LISTENER_ATTRIBUTE) instanceof String;
     }
 
     @Override
     public void initialize(ContainerContext context) {
         try {
             ServletContext servletContext = context.getServletContext();
-            String mode = (String)servletContext.getAttribute(JETTY_CDI_ATTRIBUTE);
+            String mode = (String) servletContext.getAttribute(JETTY_CDI_ATTRIBUTE);
             if (mode == null) {
                 mode = DECORATING_LISTENER_MODE;
             }
diff --git a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyLegacyContainer.java b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyLegacyContainer.java
index 0d19a20ccbd..ac6b7e6582e 100644
--- a/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyLegacyContainer.java
+++ b/environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty/JettyLegacyContainer.java
@@ -24,15 +24,18 @@
 
 /**
  * Legacy Jetty container.
- * 
    This container relies on the the following Jetty APIs to be exposed
- * to the webapp: